diff --git a/Makefile b/Makefile index d13788b1ade..2cf77f36c59 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,8 @@ REQUIREMENTS := test-requirements.txt requirements.txt # 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 ?= 20.3.3 +# 202403: Use pip 24.0 which is the highest supported version across Python 3.8 - 3.10 +PIP_VERSION ?= 24.0 SETUPTOOLS_VERSION ?= 51.3.3 PIP_OPTIONS := $(ST2_PIP_OPTIONS) diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 7f3d2e18bf0..6881699caf5 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -8,8 +8,6 @@ cffi<1.15.0 # NOTE: 2.0 version breaks pymongo work with hosts dnspython>=1.16.0,<2.0.0 cryptography==39.0.1 -# Note: 0.20.0 removed select.poll() on which some of our code and libraries we -# depend on rely eventlet==0.33.3 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 @@ -17,8 +15,8 @@ flex==6.14.1 gitpython<=3.1.37 # Needed by gitpython, old versions used to bundle it gitdb==4.0.2 -# Note: greenlet is used by eventlet -greenlet==1.0.0 +# Note: greenlet is used by eventlet (2023: 3.0.3 support for py3.10) +greenlet==3.0.3 gunicorn==21.2.0 jsonpath-rw==1.4.0 jsonschema==3.2.0 @@ -35,10 +33,9 @@ networkx<3 # but the wheel on pypi does not say it supports python3.8, so pip gets # confused. For now, pin decorator to work around pip's confusion. decorator==4.4.2 -# NOTE: Recent version substantially affect the performance and add big import time overhead -# See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details -oslo.config>=1.12.1,<1.13 -oslo.utils<5.0,>=4.0.0 +# Use latest (Mar 2024) oslo config for py3.10 support. +oslo.config==9.4.0 +oslo.utils==7.1.0 # paramiko 2.11.0 is needed by cryptography > 37.0.0 paramiko==2.11.0 passlib==1.7.4 @@ -54,7 +51,7 @@ python-editor==1.0.4 python-keyczar==0.716 pytz==2021.1 pywinrm==0.4.1 -pyyaml==5.4.1 +pyyaml==5.3.1 redis==4.1.4 requests[security]==2.25.1 retrying==1.3.3 diff --git a/requirements.txt b/requirements.txt index 8e3c61433c7..c07c8efaa8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ eventlet==0.33.3 flex==6.14.1 gitdb==4.0.2 gitpython<=3.1.37 -greenlet==1.0.0 +greenlet==3.0.3 gunicorn==21.2.0 importlib-metadata>=4.8.3,<=4.10.1 jinja2==2.11.3 @@ -38,8 +38,8 @@ nose-parallel==0.4.0 nose-timer==1.0.1 orjson==3.5.2 orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 -oslo.config>=1.12.1,<1.13 -oslo.utils<5.0,>=4.0.0 +oslo.config==9.4.0 +oslo.utils==7.1.0 paramiko==2.11.0 passlib==1.7.4 prettytable==2.1.0 @@ -57,7 +57,7 @@ python-json-logger python-statsd==2.1.0 pytz==2021.1 pywinrm==0.4.1 -pyyaml==5.4.1 +pyyaml==5.3.1 redis==4.1.4 rednose requests[security]==2.25.1 diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index bdfe4e8b1ce..7877e135886 100644 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -14,12 +14,12 @@ jinja2==2.11.3 kombu==5.0.2 lockfile==0.12.2 logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux" -oslo.config>=1.12.1,<1.13 -oslo.utils<5.0,>=4.0.0 +oslo.config==9.4.0 +oslo.utils==7.1.0 pyinotify==0.9.6 ; platform_system=="Linux" pyparsing<3 python-dateutil==2.8.1 python-json-logger -pyyaml==5.4.1 +pyyaml==5.3.1 requests[security]==2.25.1 six==1.13.0 diff --git a/st2api/requirements.txt b/st2api/requirements.txt index 5b94711ba79..b7af2f9f864 100644 --- a/st2api/requirements.txt +++ b/st2api/requirements.txt @@ -10,8 +10,8 @@ gunicorn==21.2.0 jsonschema==3.2.0 kombu==5.0.2 mongoengine>=0.21.0,<0.24.0 -oslo.config>=1.12.1,<1.13 -oslo.utils<5.0,>=4.0.0 +oslo.config==9.4.0 +oslo.utils==7.1.0 pymongo>=3.11.0,<3.13.0 pyparsing<3 simplejson diff --git a/st2auth/requirements.txt b/st2auth/requirements.txt index 05a14eb595d..08564f329ba 100644 --- a/st2auth/requirements.txt +++ b/st2auth/requirements.txt @@ -8,7 +8,7 @@ bcrypt==3.2.0 eventlet==0.33.3 gunicorn==21.2.0 -oslo.config>=1.12.1,<1.13 +oslo.config==9.4.0 passlib==1.7.4 pymongo>=3.11.0,<3.13.0 six==1.13.0 diff --git a/st2client/requirements.txt b/st2client/requirements.txt index 143e2ba6f5f..a68c5773b5f 100644 --- a/st2client/requirements.txt +++ b/st2client/requirements.txt @@ -20,7 +20,7 @@ pysocks python-dateutil==2.8.1 python-editor==1.0.4 pytz==2021.1 -pyyaml==5.4.1 +pyyaml==5.3.1 requests[security]==2.25.1 six==1.13.0 sseclient-py==1.7 diff --git a/st2common/requirements.txt b/st2common/requirements.txt index 00182fd433d..6b07e9b7f6a 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -18,7 +18,7 @@ eventlet==0.33.3 flex==6.14.1 gitdb==4.0.2 gitpython<=3.1.37 -greenlet==1.0.0 +greenlet==3.0.3 jinja2==2.11.3 jsonpath-rw==1.4.0 jsonschema==3.2.0 @@ -28,13 +28,13 @@ mongoengine>=0.21.0,<0.24.0 networkx<3 orjson==3.5.2 orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0 -oslo.config>=1.12.1,<1.13 +oslo.config==9.4.0 paramiko==2.11.0 pyOpenSSL==23.1.0 pymongo>=3.11.0,<3.13.0 python-dateutil==2.8.1 python-statsd==2.1.0 -pyyaml==5.4.1 +pyyaml==5.3.1 redis==4.1.4 requests[security]==2.25.1 retrying==1.3.3 diff --git a/st2reactor/requirements.txt b/st2reactor/requirements.txt index 321e89f6ee4..1e4eb1301b7 100644 --- a/st2reactor/requirements.txt +++ b/st2reactor/requirements.txt @@ -10,6 +10,6 @@ eventlet==0.33.3 jsonpath-rw==1.4.0 jsonschema==3.2.0 kombu==5.0.2 -oslo.config>=1.12.1,<1.13 +oslo.config==9.4.0 python-dateutil==2.8.1 six==1.13.0 diff --git a/st2stream/requirements.txt b/st2stream/requirements.txt index b8522206976..ebaa244861d 100644 --- a/st2stream/requirements.txt +++ b/st2stream/requirements.txt @@ -10,8 +10,8 @@ gunicorn==21.2.0 jsonschema==3.2.0 kombu==5.0.2 mongoengine>=0.21.0,<0.24.0 -oslo.config>=1.12.1,<1.13 -oslo.utils<5.0,>=4.0.0 +oslo.config==9.4.0 +oslo.utils==7.1.0 pymongo>=3.11.0,<3.13.0 pyparsing<3 six==1.13.0 diff --git a/test-requirements.txt b/test-requirements.txt index 0145399504e..f79db3799c4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -22,8 +22,8 @@ rednose nose-timer==1.0.1 # splitting tests run on a separate CI machines nose-parallel==0.4.0 -# Required by st2client tests -pyyaml==5.4.1 +# Required by st2client tests (202403: downgrade pyyaml to 5.3.1 to avoid pyyaml AttributeError: cython_sources error.) +pyyaml==5.3.1 RandomWords gunicorn==21.2.0 psutil==5.8.0