Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,6 @@ python_requirement(
],
)

python_requirement(
name="setuptools-reqs",
resolve="setuptools",
requirements=[
# setuptools 59.7 (at least) does not support python 3.6
"setuptools>=50.3.0,<59.0",
"wheel>=0.35.1,<0.38",
],
)

python_requirement(
name="twine-reqs",
resolve="twine",
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Fixed
Changed
~~~~~~~
* Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118
* Bumped many deps based on the lockfile generated by pants+pex. #6181 (by @cognifloyd and @nzlosh)
* Bumped many deps based on the lockfile generated by pants+pex. #6181 #6227 (by @cognifloyd and @nzlosh)
* Switch to python3's standard lib unittest from unittest2, a backport of python3 unittest features for python2. #6187 (by @nzlosh)
* Drop Python 3.6 testing in CircleCI. #6080
Contributed by (@philipphomberger Schwarz IT KG)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +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 ?= 24.0
SETUPTOOLS_VERSION ?= 69.5.1
PIP_VERSION ?= 24.2
SETUPTOOLS_VERSION ?= 72.1.0
PIP_OPTIONS := $(ST2_PIP_OPTIONS)

ifndef PYLINT_CONCURRENCY
Expand Down
2 changes: 1 addition & 1 deletion contrib/runners/winrm_runner/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# If you want to update depdencies for a single component, modify the
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
pywinrm==0.4.3
pywinrm==0.5.0
36 changes: 18 additions & 18 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ networkx==2.8.8
# now jsonpath-rw is the only thing that depends on decorator (a transitive dep)
decorator==5.1.1
# 202403: Bump oslo.config for py3.10 support.
oslo.config==9.4.0
oslo.utils==7.1.0
oslo.config==9.5.0
oslo.utils==7.2.0
# paramiko 2.11.0 is needed by cryptography > 37.0.0
paramiko==3.4.0
passlib==1.7.4
Expand All @@ -41,47 +41,47 @@ prompt-toolkit==3.0.43
pyinotify==0.9.6 ; platform_system=="Linux"
pymongo==3.12.3
pyparsing==3.1.2
zstandard==0.22.0
zstandard==0.23.0
# pyOpenSSL 23.1.0 supports cryptography up to 40.0.x
#pyOpenSSL==23.1.0
# 202403: switch from python-editor to editor for py3.10 support
editor==1.6.6
# editor dependency, required here for inclusion in st2client setup.py
pygments==2.17.2
pygments==2.18.0
python-keyczar==0.716
pytz==2024.1
pywinrm==0.4.3
pywinrm==0.5.0
pyyaml==6.0.1
redis==5.0.4
requests==2.31.0
redis==5.0.7
requests==2.32.3
retrying==1.3.4
routes==2.5.1
semver==3.0.2
six==1.16.0
argparse==1.4.0
argcomplete==3.3.0
prettytable==3.10.0
argcomplete==3.4.0
prettytable==3.10.2
importlib-metadata==7.1.0
typing-extensions==4.11.0
# NOTE: sseclient has various issues which sometimes hang the connection for a long time, etc.
sseclient-py==1.8.0
stevedore==5.2.0
tenacity==8.2.3
tenacity==9.0.0
tooz==6.2.0
# Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well.
# virtualenv==20.26.0 (<21) has pip==24.0 wheel==0.43.0 setuptools==69.5.1
# lockfiles/st2.lock has pip==24.0 wheel==0.43.0 setuptools==69.5.1
virtualenv==20.26.1
# virtualenv==20.26.3 (<21) has pip==24.1 wheel==0.43.0 setuptools==70.1.0
# lockfiles/st2.lock has pip==24.2 wheel==0.43.0 setuptools==72.1.0
virtualenv==20.26.3
webob==1.8.7
zake==0.2.2
# test requirements below
bcrypt==4.1.2
jinja2==3.1.3
bcrypt==4.2.0
jinja2==3.1.4
mock==5.1.0
nose-timer==1.0.1
nose-parallel==0.4.0
psutil==5.9.8
psutil==6.0.0
python-dateutil==2.9.0
python-statsd==2.1.0
orjson==3.10.1
zipp==3.18.1
orjson==3.10.6
zipp==3.19.2
120 changes: 0 additions & 120 deletions lockfiles/setuptools.lock

This file was deleted.

Loading