delete queues for integration

.github/workflows/ci.yaml

@@ -55,7 +55,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -117,7 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - {version-short: '3.8', version: '3.8.18'}
+          - {version-short: '3.10', version: '3.10.16'}
     services:
       mongo:
         image: mongo:7.0
@@ -231,13 +230,6 @@ jobs:
           ln -s ${GITHUB_WORKSPACE}/virtualenv/bin/st2 /usr/local/bin/st2
           ln -s ${GITHUB_WORKSPACE}/st2common/bin/st2-run-pack-tests /usr/local/bin/st2-run-pack-tests
 
-      - name: Install st2client
-        timeout-minutes: 5
-        run: |
-          cd ./st2client
-          pip3 install --upgrade pip
-          python3 setup.py develop
-
       - name: Run self-verification script
         env:
           ST2_CONF: /home/runner/work/st2/st2/conf/st2.ci.conf
@@ -272,7 +264,6 @@ jobs:
         # NOTE: To speed the CI run, we split unit and integration tests into multiple jobs where
         # each job runs subset of tests.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -408,7 +399,7 @@ jobs:
         # NOTE: We only generate and submit coverage report for master and version branches and
         # only when the build succeeds (default on GitHub Actions, this was not the case on Travis
         # so we had to explicitly check success)
-        if: "${{ success() && (env.ENABLE_COVERAGE == 'yes') && (env.PYTHON_VERSION_SHORT == '3.8')}}"
+        if: "${{ success() && (env.ENABLE_COVERAGE == 'yes') && (env.PYTHON_VERSION_SHORT == '3.10')}}"
         run: |
           ./scripts/ci/submit-codecov-coverage.sh
         env:
@@ -427,7 +418,6 @@ jobs:
         # NOTE: To speed-up the CI run, we split unit and integration tests into multiple jobs where
         # each job runs subset of tests.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -577,7 +567,7 @@ jobs:
 
       - name: Codecov
         # NOTE: We only generate and submit coverage report for master and version branches and only when the build succeeds (default on GitHub Actions, this was not the case on Travis so we had to explicitly check success)
-        if: "${{ success() && (env.ENABLE_COVERAGE == 'yes') && (env.TASK == 'ci-integration') && (env.PYTHON_VERSION_SHORT == '3.8')}}"
+        if: "${{ success() && (env.ENABLE_COVERAGE == 'yes') && (env.TASK == 'ci-integration') && (env.PYTHON_VERSION_SHORT == '3.10')}}"
         run: |
           ./scripts/ci/submit-codecov-coverage.sh
         env:

.github/workflows/microbenchmarks.yaml

@@ -44,7 +44,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}

.github/workflows/orquesta-integration-tests.yaml

@@ -55,7 +55,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}

.github/workflows/test.yaml

@@ -128,7 +128,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -225,7 +224,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -314,7 +312,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -435,7 +432,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}
@@ -555,7 +551,6 @@ jobs:
         # NOTE: We need to use full Python version as part of Python deps cache key otherwise
         # setup virtualenv step will fail.
         python:
-          - {version-short: '3.8', version: '3.8.18'}
           - {version-short: '3.9', version: '3.9.21'}
           - {version-short: '3.10', version: '3.10.16'}
           - {version-short: '3.11', version: '3.11.11'}

CHANGELOG.rst

@@ -33,6 +33,7 @@ Fixed
 * Fix Popen.pid typo in st2tests. #6184
 * Bump tooz package to `6.2.0` to fix TLS. #6220 (@jk464)
 * Shells via `pywinrm` are initialized with the 65001 codepage to ensure raw string responses are UTF-8. #6034 (@stealthii)
+* Fix integration test required clean rabbit queue; bump pip, pyproject.toml fixes; bump setuptool; remove unneeded PY3 checks (@guzzijones12)
 
 Changed
 ~~~~~~~

Makefile

@@ -60,7 +60,7 @@ ST2TESTS_REDIS_PORT := 6379
 # Pin common pip version here across all the targets
 # Note! Periodic maintenance pip upgrades are required to be up-to-date with the latest pip security fixes and updates
 PIP_VERSION ?= 25.0.1
-SETUPTOOLS_VERSION ?= 75.3.2
+SETUPTOOLS_VERSION ?= 80.9.0
 PIP_OPTIONS := $(ST2_PIP_OPTIONS)
 
 ifndef PYLINT_CONCURRENCY
@@ -537,7 +537,7 @@ flake8: requirements .flake8
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)"
 
-	$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd ..
+	$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install . ; cd ..
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version
 	$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client"
 

contrib/runners/action_chain_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/announcement_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/http_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/inquirer_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/local_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/noop_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/orquesta_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/orquesta_runner/requirements.txt

@@ -6,4 +6,4 @@
 # 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@5ba1467614b2ef8b4709b2ca89e68baa671e8975
-setuptools<78
+setuptools

contrib/runners/python_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/remote_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

contrib/runners/winrm_runner/dist_utils.py

@@ -22,7 +22,6 @@
 
 import os
 import re
-import sys
 
 # NOTE: This script can't rely on any 3rd party dependency so we need to use this code here
 #
@@ -36,12 +35,6 @@
 #       for subpackages.
 #       At the very least we can vendorize some of their code instead of reimplementing
 #       each piece of their code every time our parsing breaks.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    text_type = str
-else:
-    text_type = unicode  # noqa  # pylint: disable=E0602
 
 GET_PIP = "curl https://bootstrap.pypa.io/get-pip.py | python"
 

fixed-requirements.txt

@@ -10,7 +10,7 @@ amqp==5.3.1
 apscheduler==3.11.0
 chardet==5.2.0
 cffi==1.17.1
-cryptography==43.0.3
+cryptography==45.0.7
 eventlet==0.39.1
 flex==6.14.1
 # Note: installs gitpython==3.1.37 (security fixed) under py3.8 and gitpython==3.1.18 (latest available, vulnerable) under py3.6
@@ -74,7 +74,6 @@ tooz==6.3.0
 virtualenv==20.34.0
 # This setuptools version number is in the Makefile, but CircleCI builds are pulling a version
 # that is incompatible with our logshipper fork.
-setuptools<78
 webob==1.8.9
 webtest==3.0.1
 zake==0.2.2

lockfiles/st2.lock

@@ -5694,7 +5694,7 @@
           "artifacts": [
             {
               "algorithm": "sha256",
-              "hash": "d34d5cbb539182553ec8b35a0763decb6b66bd37aa51f3a61db1eb30449f6f10",
+              "hash": "f445faec6e5f55437f379be08dd78aa2f1181ed9dbd04fe19bddfb6f4c2fe911",
               "url": "git+https://github.com/StackStorm/st2-rbac-backend.git@master"
             }
           ],

pyproject.toml

@@ -16,3 +16,6 @@ exclude = '''
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "-l"
+
+[tool.setuptools]
+py-modules = []