Skip to content

Commit 2271db0

Browse files
authored
Bump dnspython to 2.6.1 to fix pack CI failure on py3.10/py3.11 (#6265)
1 parent 6c6ac79 commit 2271db0

File tree

9 files changed

+266
-245
lines changed

9 files changed

+266
-245
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ Changed
6060
* Update CI from testing with mongo 4.4 to testing with MongoDB 7.0. #6246
6161
Contributed by @guzzijones
6262

63+
* Relaxed `dnspython` pinning for compatibility with python 3.10 and greater. #6265
64+
Contributed by @nzlosh
65+
6366
Added
6467
~~~~~
6568
* Continue introducing `pants <https://www.pantsbuild.org/docs>`_ to improve DX (Developer Experience)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ST2TESTS_REDIS_PORT := 6379
6060
# Pin common pip version here across all the targets
6161
# Note! Periodic maintenance pip upgrades are required to be up-to-date with the latest pip security fixes and updates
6262
PIP_VERSION ?= 24.2
63-
SETUPTOOLS_VERSION ?= 75.1.0
63+
SETUPTOOLS_VERSION ?= 75.2.0
6464
PIP_OPTIONS := $(ST2_PIP_OPTIONS)
6565

6666
ifndef PYLINT_CONCURRENCY

fixed-requirements.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ amqp==5.2.0
44
apscheduler==3.10.4
55
chardet==3.0.4
66
cffi==1.17.1
7-
# NOTE: 2.0 version breaks pymongo work with hosts
8-
dnspython==1.16.0
9-
cryptography==43.0.1
7+
cryptography==43.0.3
108
eventlet==0.37.0
119
flex==6.14.1
1210
# Note: installs gitpython==3.1.37 (security fixed) under py3.8 and gitpython==3.1.18 (latest available, vulnerable) under py3.6
@@ -15,7 +13,7 @@ gitpython==3.1.43
1513
# Needed by gitpython, old versions used to bundle it
1614
gitdb==4.0.11
1715
# Note: greenlet is used by eventlet
18-
greenlet==3.1.0
16+
greenlet==3.1.1
1917
gunicorn==23.0.0
2018
jsonpath-rw==1.4.0
2119
jsonschema==3.2.0
@@ -37,7 +35,7 @@ oslo.utils==7.3.0
3735
paramiko==3.5.0
3836
passlib==1.7.4
3937
# 202403: bump to 3.0.43 for py3.10 support
40-
prompt-toolkit==3.0.47
38+
prompt-toolkit==3.0.48
4139
pyinotify==0.9.6 ; platform_system=="Linux"
4240
pymongo==4.6.3
4341
pyparsing==3.1.4
@@ -52,7 +50,7 @@ python-keyczar==0.716
5250
pytz==2024.2
5351
pywinrm==0.5.0
5452
pyyaml==6.0.2
55-
redis==5.0.8
53+
redis==5.1.1
5654
requests==2.32.3
5755
retrying==1.3.4
5856
routes==2.5.1
@@ -69,9 +67,9 @@ stevedore==5.3.0
6967
tenacity==9.0.0
7068
tooz==6.3.0
7169
# Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well.
72-
# virtualenv==20.26.5 (<21) has pip==24.2 wheel==0.44.0 setuptools==75.1.0
73-
# lockfiles/st2.lock has pip==24.2 wheel==0.44.0 setuptools==75.1.0
74-
virtualenv==20.26.5
70+
# virtualenv==20.26.5 (<21) has pip==24.2 wheel==0.44.0 setuptools==75.2.0
71+
# lockfiles/st2.lock has pip==24.2 wheel==0.44.0 setuptools==75.2.0
72+
virtualenv==20.27.0
7573
webob==1.8.8
7674
zake==0.2.2
7775
# test requirements below
@@ -80,7 +78,7 @@ jinja2==3.1.4
8078
mock==5.1.0
8179
nose-timer==1.0.1
8280
nose-parallel==0.4.0
83-
psutil==6.0.0
81+
psutil==6.1.0
8482
python-dateutil==2.9.0.post0
8583
python-statsd==2.1.0
8684
orjson==3.10.7

lockfiles/st2-constraints.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ MarkupSafe<2.1.0,>=0.23
6262
# DROPS RESOLVED VERSION: 4.4.2
6363
#decorator==4.4.2
6464

65-
# REQUIRED BY: eventlet, pymongo
66-
# REASON: 2.0 version breaks pymongo work with hosts
67-
# NOTE: try to remove this later
68-
# DROPS RESOLVED VERSION: 1.16
69-
dnspython>=1.16.0,<2.0.0
70-
7165
# REQUIRED BY: eventlet
7266
# REASON: eventlet is difficult to upgrade.
7367
# greenlet 2 adds py3.11 support, platform compat changes, and better error checking

lockfiles/st2.lock

Lines changed: 241 additions & 215 deletions
Large diffs are not rendered by default.

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ bcrypt==4.2.0
1414
cffi==1.17.1
1515
chardet==3.0.4
1616
ciso8601
17-
cryptography==43.0.1
17+
cryptography==43.0.3
1818
decorator==5.1.1
19-
dnspython==1.16.0
19+
dnspython
2020
editor==1.6.6
2121
eventlet==0.37.0
2222
flex==6.14.1
2323
gitdb==4.0.11
2424
gitpython==3.1.43
25-
greenlet==3.1.0
25+
greenlet==3.1.1
2626
gunicorn==23.0.0
2727
importlib-metadata==7.1.0
2828
jinja2==3.1.4
@@ -44,8 +44,8 @@ oslo.utils==7.3.0
4444
paramiko==3.5.0
4545
passlib==1.7.4
4646
prettytable==3.10.2
47-
prompt-toolkit==3.0.47
48-
psutil==6.0.0
47+
prompt-toolkit==3.0.48
48+
psutil==6.1.0
4949
pyOpenSSL
5050
pygments==2.18.0
5151
pyinotify==0.9.6 ; platform_system=="Linux"
@@ -59,7 +59,7 @@ python-statsd==2.1.0
5959
pytz==2024.2
6060
pywinrm==0.5.0
6161
pyyaml==6.0.2
62-
redis==5.0.8
62+
redis==5.1.1
6363
rednose
6464
requests==2.32.3
6565
retrying==1.3.4

st2client/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
argcomplete==3.4.0
99
cffi==1.17.1
1010
chardet==3.0.4
11-
cryptography==43.0.1
11+
cryptography==43.0.3
1212
editor==1.6.6
1313
importlib-metadata==7.1.0
1414
jsonpath-rw==1.4.0
1515
jsonschema==3.2.0
1616
orjson==3.10.7
1717
prettytable==3.10.2
18-
prompt-toolkit==3.0.47
18+
prompt-toolkit==3.0.48
1919
pyOpenSSL
2020
pygments==2.18.0
2121
pysocks

st2common/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ apscheduler==3.10.4
1111
cffi==1.17.1
1212
chardet==3.0.4
1313
ciso8601
14-
cryptography==43.0.1
14+
cryptography==43.0.3
1515
decorator==5.1.1
16-
dnspython==1.16.0
16+
dnspython
1717
eventlet==0.37.0
1818
flex==6.14.1
1919
gitdb==4.0.11
2020
gitpython==3.1.43
21-
greenlet==3.1.0
21+
greenlet==3.1.1
2222
jinja2==3.1.4
2323
jsonpath-rw==1.4.0
2424
jsonschema==3.2.0
@@ -35,7 +35,7 @@ pymongo==4.6.3
3535
python-dateutil==2.9.0.post0
3636
python-statsd==2.1.0
3737
pyyaml==6.0.2
38-
redis==5.0.8
38+
redis==5.1.1
3939
requests==2.32.3
4040
retrying==1.3.4
4141
routes==2.5.1

st2tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mock==5.1.0
1010
nose
1111
nose-parallel==0.4.0
1212
nose-timer==1.0.1
13-
psutil==6.0.0
13+
psutil==6.1.0
1414
pyrabbit
1515
rednose
1616
unittest2

0 commit comments

Comments
 (0)