More dependency tweaks and update commandline for pip-compile

Makefile

@@ -739,8 +739,8 @@ check-dependency-conflicts:
 	@echo
 	# Verify there are no conflicting dependencies
 	cat st2*/requirements.txt contrib/runners/*/requirements.txt | sort -u > req.txt && \
-	$(VIRTUALENV_DIR)/bin/pip-compile req.txt || exit 1; \
-	if [[ -e req.txt ]]; then rm req.txt; fi
+	$(VIRTUALENV_DIR)/bin/pip-compile --strip-extras --output-file req.out req.txt || exit 1; \
+	rm -f req.txt req.out
 
 .PHONY: virtualenv
 	# Note: We always want to update virtualenv/bin/activate file to make sure

contrib/runners/orquesta_runner/in-requirements.txt

@@ -1 +1,2 @@
-orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0
+#orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0
+orquesta@ git+https://github.com/nzlosh/orquesta.git@st2v39_compat

contrib/runners/orquesta_runner/requirements.txt

@@ -5,4 +5,4 @@
 # If you want to update depdencies for a single component, modify the
 # in-requirements.txt for that component and then run 'make requirements' to
 # update the component requirements.txt
-orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0
+orquesta@ git+https://github.com/nzlosh/orquesta.git@st2v39_compat

fixed-requirements.txt

@@ -58,7 +58,7 @@ pyOpenSSL==24.1.0
 # 202403: switch from python-editor to editor for py3.10 support
 editor==1.6.6
 # editor dependency, required here for inclusion in st2client setup.py
-Pygments==2.5.2
+pygments==2.5.2
 # 202404: Use latest chardet for tox / and cross project dependency Orquesta.
 chardet==5.2.0
 python-keyczar==0.716
@@ -86,7 +86,7 @@ tenacity>=3.2.1,<7.0.0
 tooz==2.8.0
 # Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well.
 # virtualenv==20.4.0 (<21) has pip==20.3.3 wheel==0.36.2 setuptools==51.3.3
-virtualenv==20.4.0
+virtualenv==20.25.1
 webob==1.8.7
 zake==0.2.2
 # test requirements below

lockfiles/st2.lock

@@ -9,7 +9,6 @@
 //     "CPython==3.9.*"
 //   ],
 //   "generated_with_requirements": [
-//     "Pygments==2.5.2",
 //     "RandomWords",
 //     "apscheduler==3.7.0",
 //     "argcomplete==3.2.3",
@@ -45,6 +44,7 @@
 //     "prettytable==2.1.0",
 //     "prompt-toolkit==3.0.43",
 //     "psutil==5.8.0",
+//     "pygments==2.5.2",
 //     "pyinotify<=0.10,>=0.9.5; platform_system == \"Linux\"",
 //     "pylint==3.1.0",
 //     "pymongo<3.13.0,>=3.11.0",
@@ -4228,7 +4228,6 @@
   "pip_version": "23.1.2",
   "prefer_older_binary": false,
   "requirements": [
-    "Pygments==2.5.2",
     "RandomWords",
     "apscheduler==3.7.0",
     "argcomplete==3.2.3",
@@ -4264,6 +4263,7 @@
     "prettytable==2.1.0",
     "prompt-toolkit==3.0.43",
     "psutil==5.8.0",
+    "pygments==2.5.2",
     "pyinotify<=0.10,>=0.9.5; platform_system == \"Linux\"",
     "pylint==3.1.0",
     "pymongo<3.13.0,>=3.11.0",

requirements-pants.txt

@@ -51,7 +51,7 @@ pylint==3.1.0
 pytest==6.2.5
 python-dateutil==2.8.1
 editor==1.6.6
-Pygments==2.5.2
+pygments==2.5.2
 # pythonjsonlogger referenced in st2actions/conf/logging.conf
 python-json-logger
 python-statsd==2.1.0

requirements.txt

@@ -6,7 +6,6 @@
 # in-requirements.txt for that component and then run 'make requirements' to
 # update the component requirements.txt
 MarkupSafe==2.1.5
-Pygments==2.5.2
 RandomWords
 amqp<6.0.0,>=5.1.1
 apscheduler==3.7.0
@@ -45,6 +44,7 @@ prettytable==2.1.0
 prompt-toolkit==3.0.43
 psutil==5.8.0
 pyOpenSSL==24.1.0
+pygments==2.5.2
 pyinotify==0.9.6 ; platform_system=="Linux"
 pymongo>=3.11.0,<3.13.0
 pyparsing<3

st2client/in-requirements.txt

@@ -13,7 +13,7 @@ requests
 six
 sseclient-py
 editor
-Pygments
+pygments
 prompt-toolkit
 # mention cffi used by cryptography so we can control version
 cffi

st2client/requirements.txt

@@ -5,7 +5,6 @@
 # If you want to update depdencies for a single component, modify the
 # in-requirements.txt for that component and then run 'make requirements' to
 # update the component requirements.txt
-Pygments==2.5.2
 argcomplete==3.2.3
 cffi<1.15.0
 chardet==5.2.0
@@ -18,6 +17,7 @@ orjson==3.5.2
 prettytable==2.1.0
 prompt-toolkit==3.0.43
 pyOpenSSL==24.1.0
+pygments==2.5.2
 pysocks
 python-dateutil==2.8.1
 pytz==2021.1

test-requirements.txt

@@ -39,10 +39,7 @@ pyrabbit
 # 202403: Bumped to 23.6.21.0 for py3.10 support
 prance==23.6.21.0
 # pip-tools provides pip-compile: to check for version conflicts
-# pip-tools 5.3 needs pip<20.3
-# pip-tools 5.4 needs pip>=20.1
-# pip-tools 6.0 needs pip>=20.3
-pip-tools>=5.4,<6.1
+pip_tools==7.4.1
 # 202403: Use 6.2.5 for py3.10 support
 pytest==6.2.5
 pytest-cov==4.1.0