Use hacking fork as dependency and align modules with stackstorm core.

Makefile

@@ -11,6 +11,7 @@
 # limitations under the License.
 
 PY3 := $(shell which python3)
+PIP_VERSION = "24.0"
 
 # Virtual Environment
 VENV_DIR ?= .venv
@@ -21,10 +22,11 @@ TOX_DIR ?= .tox
 # Sphinx Document Options
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXAUTO	  = sphinx-autobuild
+SPHINXAUTO    = sphinx-autobuild
 SPHINXPROJ    = Orquesta
 SOURCEDIR     = docs/source
 BUILDDIR      = docs/build
+EGGDIR        = orquesta.egg-info
 
 # Packaging Options
 PKGDISTDIR    = dist
@@ -37,17 +39,20 @@ clean:
 	rm -rf $(BUILDDIR)
 	rm -rf $(PKGDISTDIR)
 	rm -rf $(PKGBUILDDIR)
+	rm -rf $(EGGDIR)
 
 .PHONY: venv
 venv:
-	test -d $(VENV_DIR) || virtualenv -p $(PY3) $(VENV_DIR)
+	test -d $(VENV_DIR) || $(PY3) -m venv $(VENV_DIR)
 
 .PHONY: reqs
 reqs: venv
-	$(VENV_DIR)/bin/pip install --upgrade "pip==20.3.3"
+	echo Install pip version $(PIP_VERSION) to match st2 core.
+	$(VENV_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
 	$(VENV_DIR)/bin/pip install -r requirements.txt
 	$(VENV_DIR)/bin/pip install -r requirements-test.txt
 	$(VENV_DIR)/bin/pip install -r requirements-docs.txt
+	$(VENV_DIR)/bin/pip install -r requirements-ci.txt
 	$(VENV_DIR)/bin/python setup.py develop
 	echo
 
@@ -61,7 +66,7 @@ format:
 
 .PHONY: check
 check:
-	tox
+	$(VENV_DIR)/bin/tox
 
 .PHONY: docs
 docs: reqs

requirements-ci.txt

@@ -1,4 +1,3 @@
-# Different versions of tox are required by python version
 tox-gh-actions
-tox==3.28.0 ; python_version == "3.6"
-tox==4.11.3; python_version >= "3.8"
+tox==4.11.3
+wheel

requirements-docs.txt

@@ -1,3 +1,4 @@
-sphinx>=2.0
+# 202404: Align all requirements with st2 test-requirements
+sphinx>=5.0.0,<7.2.0
 sphinx-autobuild
 sphinx_rtd_theme

requirements-test.txt

@@ -1,11 +1,12 @@
-black
+# 202404: Align all requirements with st2 test-requirements
 coverage
-flake8<3.9.0,>=3.8.0
-hacking
-mock>=1.0
-pytest
-pytest-cov
-pep8>=1.6.0,<1.7
-pylint>=2.5.2,<2.6
+black==22.3.0
+flake8==7.0.0
+mock==4.0.3
+pytest==6.2.5
+pytest-cov==4.1.0
+pep8==1.7.1
+pylint==3.1.0
 twine
-unittest2
+# 202404: Use forked version for flake8 v7.0.0 to align requirements with st2 test-requirements
+hacking @ git+https://github.com/nzlosh/hacking@flake8v7

requirements.txt

@@ -1,13 +1,13 @@
-chardet>=3.0.2,<4.0.0
-eventlet
-Jinja2>=2.11 # BSD License (3 clause)
-jsonschema!=2.5.0,>=2.0.0,<=3.2 # MIT
-# networkx v2.6 does not support Python3.6.  Update networkx to match st2
-networkx>=2.5.1,<2.6; python_version < '3.7'
-networkx>=2.6,<3; python_version >= '3.7'
-python-dateutil
-PyYAML>=3.1.0 # MIT
-six>=1.9.0
+# 202404: Align all requirements with st2 fixed-requirements
+chardet==5.2.0
+eventlet==0.35.2
+jinja2==3.1.3 # BSD License (3 clause)
+jsonschema==3.2.0 # MIT
+# networkx v3.2 and greater does not support Python3.8.
+networkx<3.2
+python-dateutil==2.8.1
+pyyaml==5.3.1 # MIT
+six~=1.15
 stevedore>=1.3.0 # Apache-2.0
 ujson>=1.35 # BSD License
 yaql>=1.1.0 # Apache-2.0