Skip to content

Commit fcd6d67

Browse files
committed
Bump version for py3.10 support
1 parent 21e34fb commit fcd6d67

File tree

11 files changed

+27
-29
lines changed

11 files changed

+27
-29
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ REQUIREMENTS := test-requirements.txt requirements.txt
5555

5656
# Pin common pip version here across all the targets
5757
# Note! Periodic maintenance pip upgrades are required to be up-to-date with the latest pip security fixes and updates
58-
PIP_VERSION ?= 20.3.3
58+
# 202403: Use pip 24.0 which is the highest supported version across Python 3.8 - 3.10
59+
PIP_VERSION ?= 24.0
5960
SETUPTOOLS_VERSION ?= 51.3.3
6061
PIP_OPTIONS := $(ST2_PIP_OPTIONS)
6162

fixed-requirements.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ cffi<1.15.0
88
# NOTE: 2.0 version breaks pymongo work with hosts
99
dnspython>=1.16.0,<2.0.0
1010
cryptography==39.0.1
11-
# Note: 0.20.0 removed select.poll() on which some of our code and libraries we
12-
# depend on rely
1311
eventlet==0.33.3
1412
flex==6.14.1
1513
# Note: installs gitpython==3.1.37 (security fixed) under py3.8 and gitpython==3.1.18 (latest available, vulnerable) under py3.6
1614
# TODO: Pin to 3.1.37 or higher after dropping python3.6 support
1715
gitpython<=3.1.37
1816
# Needed by gitpython, old versions used to bundle it
1917
gitdb==4.0.2
20-
# Note: greenlet is used by eventlet
21-
greenlet==1.0.0
18+
# Note: greenlet is used by eventlet (2023: 3.0.3 support for py3.10)
19+
greenlet==3.0.3
2220
gunicorn==21.2.0
2321
jsonpath-rw==1.4.0
2422
jsonschema==3.2.0
@@ -35,10 +33,9 @@ networkx<3
3533
# but the wheel on pypi does not say it supports python3.8, so pip gets
3634
# confused. For now, pin decorator to work around pip's confusion.
3735
decorator==4.4.2
38-
# NOTE: Recent version substantially affect the performance and add big import time overhead
39-
# See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details
40-
oslo.config>=1.12.1,<1.13
41-
oslo.utils<5.0,>=4.0.0
36+
# Use latest (Mar 2024) oslo config for py3.10 support.
37+
oslo.config==9.4.0
38+
oslo.utils==7.1.0
4239
# paramiko 2.11.0 is needed by cryptography > 37.0.0
4340
paramiko==2.11.0
4441
passlib==1.7.4
@@ -54,7 +51,7 @@ python-editor==1.0.4
5451
python-keyczar==0.716
5552
pytz==2021.1
5653
pywinrm==0.4.1
57-
pyyaml==5.4.1
54+
pyyaml==5.3.1
5855
redis==4.1.4
5956
requests[security]==2.25.1
6057
retrying==1.3.3

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ eventlet==0.33.3
2121
flex==6.14.1
2222
gitdb==4.0.2
2323
gitpython<=3.1.37
24-
greenlet==1.0.0
24+
greenlet==3.0.3
2525
gunicorn==21.2.0
2626
importlib-metadata>=4.8.3,<=4.10.1
2727
jinja2==2.11.3
@@ -38,8 +38,8 @@ nose-parallel==0.4.0
3838
nose-timer==1.0.1
3939
orjson==3.5.2
4040
orquesta@ git+https://github.com/StackStorm/[email protected]
41-
oslo.config>=1.12.1,<1.13
42-
oslo.utils<5.0,>=4.0.0
41+
oslo.config==9.4.0
42+
oslo.utils==7.1.0
4343
paramiko==2.11.0
4444
passlib==1.7.4
4545
prettytable==2.1.0
@@ -57,7 +57,7 @@ python-json-logger
5757
python-statsd==2.1.0
5858
pytz==2021.1
5959
pywinrm==0.4.1
60-
pyyaml==5.4.1
60+
pyyaml==5.3.1
6161
redis==4.1.4
6262
rednose
6363
requests[security]==2.25.1

st2actions/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jinja2==2.11.3
1414
kombu==5.0.2
1515
lockfile==0.12.2
1616
logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux"
17-
oslo.config>=1.12.1,<1.13
18-
oslo.utils<5.0,>=4.0.0
17+
oslo.config==9.4.0
18+
oslo.utils==7.1.0
1919
pyinotify==0.9.6 ; platform_system=="Linux"
2020
pyparsing<3
2121
python-dateutil==2.8.1
2222
python-json-logger
23-
pyyaml==5.4.1
23+
pyyaml==5.3.1
2424
requests[security]==2.25.1
2525
six==1.13.0

st2api/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ gunicorn==21.2.0
1010
jsonschema==3.2.0
1111
kombu==5.0.2
1212
mongoengine>=0.21.0,<0.24.0
13-
oslo.config>=1.12.1,<1.13
14-
oslo.utils<5.0,>=4.0.0
13+
oslo.config==9.4.0
14+
oslo.utils==7.1.0
1515
pymongo>=3.11.0,<3.13.0
1616
pyparsing<3
1717
simplejson

st2auth/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
bcrypt==3.2.0
99
eventlet==0.33.3
1010
gunicorn==21.2.0
11-
oslo.config>=1.12.1,<1.13
11+
oslo.config==9.4.0
1212
passlib==1.7.4
1313
pymongo>=3.11.0,<3.13.0
1414
six==1.13.0

st2client/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pysocks
2020
python-dateutil==2.8.1
2121
python-editor==1.0.4
2222
pytz==2021.1
23-
pyyaml==5.4.1
23+
pyyaml==5.3.1
2424
requests[security]==2.25.1
2525
six==1.13.0
2626
sseclient-py==1.7

st2common/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ eventlet==0.33.3
1818
flex==6.14.1
1919
gitdb==4.0.2
2020
gitpython<=3.1.37
21-
greenlet==1.0.0
21+
greenlet==3.0.3
2222
jinja2==2.11.3
2323
jsonpath-rw==1.4.0
2424
jsonschema==3.2.0
@@ -28,13 +28,13 @@ mongoengine>=0.21.0,<0.24.0
2828
networkx<3
2929
orjson==3.5.2
3030
orquesta@ git+https://github.com/StackStorm/[email protected]
31-
oslo.config>=1.12.1,<1.13
31+
oslo.config==9.4.0
3232
paramiko==2.11.0
3333
pyOpenSSL==23.1.0
3434
pymongo>=3.11.0,<3.13.0
3535
python-dateutil==2.8.1
3636
python-statsd==2.1.0
37-
pyyaml==5.4.1
37+
pyyaml==5.3.1
3838
redis==4.1.4
3939
requests[security]==2.25.1
4040
retrying==1.3.3

st2reactor/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ eventlet==0.33.3
1010
jsonpath-rw==1.4.0
1111
jsonschema==3.2.0
1212
kombu==5.0.2
13-
oslo.config>=1.12.1,<1.13
13+
oslo.config==9.4.0
1414
python-dateutil==2.8.1
1515
six==1.13.0

st2stream/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ gunicorn==21.2.0
1010
jsonschema==3.2.0
1111
kombu==5.0.2
1212
mongoengine>=0.21.0,<0.24.0
13-
oslo.config>=1.12.1,<1.13
14-
oslo.utils<5.0,>=4.0.0
13+
oslo.config==9.4.0
14+
oslo.utils==7.1.0
1515
pymongo>=3.11.0,<3.13.0
1616
pyparsing<3
1717
six==1.13.0

0 commit comments

Comments
 (0)