Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dnspython to 2.6.1 to fix pack CI failure on py3.10/py3.11 #6265

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Bump dnspython to 2.6.1 to fix pack CI failure on py3.10/py3.11 #6265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14079d1
Bump dnspython to 2.6.1 to fix pack CI failure on py3.10/py3.11
nzlosh Oct 19, 2024
f8a582a
Update Makefile and requirements files with versions from pants lock …
nzlosh Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ Changed
* Update CI from testing with mongo 4.4 to testing with MongoDB 7.0. #6246
Contributed by @guzzijones

* Relaxed `dnspython` pinning for compatibility with python 3.10 and greater. #6265
Contributed by @nzlosh

Added
~~~~~
* Continue introducing `pants <https://www.pantsbuild.org/docs>`_ to improve DX (Developer Experience)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?= 24.2
SETUPTOOLS_VERSION ?= 75.1.0
SETUPTOOLS_VERSION ?= 75.2.0
PIP_OPTIONS := $(ST2_PIP_OPTIONS)

ifndef PYLINT_CONCURRENCY
Expand Down
18 changes: 8 additions & 10 deletions fixed-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ amqp==5.2.0
apscheduler==3.10.4
chardet==3.0.4
cffi==1.17.1
# NOTE: 2.0 version breaks pymongo work with hosts
dnspython==1.16.0
cryptography==43.0.1
cryptography==43.0.3
eventlet==0.37.0
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
Expand All @@ -15,7 +13,7 @@ gitpython==3.1.43
# Needed by gitpython, old versions used to bundle it
gitdb==4.0.11
# Note: greenlet is used by eventlet
greenlet==3.1.0
greenlet==3.1.1
gunicorn==23.0.0
jsonpath-rw==1.4.0
jsonschema==3.2.0
Expand All @@ -37,7 +35,7 @@ oslo.utils==7.3.0
paramiko==3.5.0
passlib==1.7.4
# 202403: bump to 3.0.43 for py3.10 support
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
pyinotify==0.9.6 ; platform_system=="Linux"
pymongo==4.6.3
pyparsing==3.1.4
Expand All @@ -52,7 +50,7 @@ python-keyczar==0.716
pytz==2024.2
pywinrm==0.5.0
pyyaml==6.0.2
redis==5.0.8
redis==5.1.1
requests==2.32.3
retrying==1.3.4
routes==2.5.1
Expand All @@ -69,9 +67,9 @@ stevedore==5.3.0
tenacity==9.0.0
tooz==6.3.0
# Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well.
# virtualenv==20.26.5 (<21) has pip==24.2 wheel==0.44.0 setuptools==75.1.0
# lockfiles/st2.lock has pip==24.2 wheel==0.44.0 setuptools==75.1.0
virtualenv==20.26.5
# virtualenv==20.26.5 (<21) has pip==24.2 wheel==0.44.0 setuptools==75.2.0
# lockfiles/st2.lock has pip==24.2 wheel==0.44.0 setuptools==75.2.0
virtualenv==20.27.0
webob==1.8.8
zake==0.2.2
# test requirements below
Expand All @@ -80,7 +78,7 @@ jinja2==3.1.4
mock==5.1.0
nose-timer==1.0.1
nose-parallel==0.4.0
psutil==6.0.0
psutil==6.1.0
python-dateutil==2.9.0.post0
python-statsd==2.1.0
orjson==3.10.7
Expand Down
6 changes: 0 additions & 6 deletions lockfiles/st2-constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ MarkupSafe<2.1.0,>=0.23
# DROPS RESOLVED VERSION: 4.4.2
#decorator==4.4.2

# REQUIRED BY: eventlet, pymongo
# REASON: 2.0 version breaks pymongo work with hosts
# NOTE: try to remove this later
# DROPS RESOLVED VERSION: 1.16
dnspython>=1.16.0,<2.0.0

# REQUIRED BY: eventlet
# REASON: eventlet is difficult to upgrade.
# greenlet 2 adds py3.11 support, platform compat changes, and better error checking
Expand Down
456 changes: 241 additions & 215 deletions lockfiles/st2.lock
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ bcrypt==4.2.0
cffi==1.17.1
chardet==3.0.4
ciso8601
cryptography==43.0.1
cryptography==43.0.3
decorator==5.1.1
dnspython==1.16.0
dnspython
editor==1.6.6
eventlet==0.37.0
flex==6.14.1
gitdb==4.0.11
gitpython==3.1.43
greenlet==3.1.0
greenlet==3.1.1
gunicorn==23.0.0
importlib-metadata==7.1.0
jinja2==3.1.4
Expand All @@ -44,8 +44,8 @@ oslo.utils==7.3.0
paramiko==3.5.0
passlib==1.7.4
prettytable==3.10.2
prompt-toolkit==3.0.47
psutil==6.0.0
prompt-toolkit==3.0.48
psutil==6.1.0
pyOpenSSL
pygments==2.18.0
pyinotify==0.9.6 ; platform_system=="Linux"
Expand All @@ -59,7 +59,7 @@ python-statsd==2.1.0
pytz==2024.2
pywinrm==0.5.0
pyyaml==6.0.2
redis==5.0.8
redis==5.1.1
rednose
requests==2.32.3
retrying==1.3.4
Expand Down
4 changes: 2 additions & 2 deletions st2client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
argcomplete==3.4.0
cffi==1.17.1
chardet==3.0.4
cryptography==43.0.1
cryptography==43.0.3
editor==1.6.6
importlib-metadata==7.1.0
jsonpath-rw==1.4.0
jsonschema==3.2.0
orjson==3.10.7
prettytable==3.10.2
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
pyOpenSSL
pygments==2.18.0
pysocks
Expand Down
8 changes: 4 additions & 4 deletions st2common/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ apscheduler==3.10.4
cffi==1.17.1
chardet==3.0.4
ciso8601
cryptography==43.0.1
cryptography==43.0.3
decorator==5.1.1
dnspython==1.16.0
dnspython
eventlet==0.37.0
flex==6.14.1
gitdb==4.0.11
gitpython==3.1.43
greenlet==3.1.0
greenlet==3.1.1
jinja2==3.1.4
jsonpath-rw==1.4.0
jsonschema==3.2.0
Expand All @@ -35,7 +35,7 @@ pymongo==4.6.3
python-dateutil==2.9.0.post0
python-statsd==2.1.0
pyyaml==6.0.2
redis==5.0.8
redis==5.1.1
requests==2.32.3
retrying==1.3.4
routes==2.5.1
Expand Down
2 changes: 1 addition & 1 deletion st2tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ mock==5.1.0
nose
nose-parallel==0.4.0
nose-timer==1.0.1
psutil==6.0.0
psutil==6.1.0
pyrabbit
rednose
unittest2
Expand Down
Loading