8000 Packaging: add dep on crudini & regenerate lockfiles/st2.lock by cognifloyd · Pull Request #6329 · StackStorm/st2 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Packaging: add dep on crudini & regenerate lockfiles/st2.lock #6329

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.

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

Merged
merged 3 commits into from
Apr 13, 2025
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
14 changes: 14 additions & 0 deletions BUILD.tools
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# This BUILD file has requirements for most of the tools resolves

python_requirement(
name="crudini-reqs",
resolve="st2",
requirements=[
"crudini",
],
)
pex_binary(
name="crudini",
resolve="st2",
dependencies=[":crudini-reqs"],
entry_point="crudini",
)
10000
python_requirement(
name="bandit-reqs",
resolve="bandit",
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Changed
~~~~~~~
* Removed code in all dist_utils.py that was sanitizing the `python_version` environment marker that limited packages in the requirements.txt only being installed on lower python versions. (by @skiedude)
* Bumped `jsonschema` 2.6.0 -> 3.2.0 now that python3.6 is not supported. #6118
* Bumped many deps based on the lockfiles generated by pants+pex. #6181 #6227 #6200 #6252 #6268 (by @cognifloyd and @nzlosh)
* Bumped many deps based on the lockfiles generated by pants+pex. #6181 #6227 #6200 #6252 #6268 #6329 (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 Expand Up @@ -80,6 +80,7 @@ Added
#6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253
#6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287 #6306 #6307
#6311 #6314 #6315 #6317 #6319 #6312 #6320 #6321 #6323 #6324 #6325 #6326 #6327 #6328
#6329
Contributed by @cognifloyd
* Build of ST2 EL9 packages #6153
Contributed by @amanda11
Expand Down
2 changes: 1 addition & 1 deletion Makefile
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 ?= 25.0.1
SETUPTOOLS_VERSION ?= 75.3.0
SETUPTOOLS_VERSION ?= 75.3.2
PIP_OPTIONS := $(ST2_PIP_OPTIONS)

ifndef PYLINT_CONCURRENCY
Expand Down
20 changes: 10 additions & 10 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apscheduler==3.11.0
chardet==5.2.0
cffi==1.17.1
cryptography==43.0.3
eventlet==0.39.0
eventlet==0.39.1
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
# TODO: Pin to 3.1.37 or higher after dropping python3.6 support
Expand All @@ -23,7 +23,7 @@ greenlet==3.1.1
gunicorn==23.0.0
jsonpath-rw==1.4.0
jsonschema==3.2.0
kombu==5.4.2
kombu==5.5.2
lockfile==0.12.2
mongoengine==0.29.1
networkx==3.1
Expand All @@ -47,7 +47,7 @@ editor==1.6.6
# editor dependency, required here for inclusion in st2client setup.py
pygments==2.19.1
python-keyczar==0.716
pytz==2025.1
pytz==2025.2
pywinrm==0.5.0
pyyaml==6.0.2
redis==5.2.1
Expand All @@ -59,7 +59,7 @@ routes==2.5.1
semver==3.0.4
six==1.17.0
argparse==1.4.0
argcomplete==3.5.3
argcomplete==3.6.2
prettytable==3.10.2
importlib-metadata==7.1.0
typing-extensions==4.12.2
Expand All @@ -69,19 +69,19 @@ 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.29.2 (<21) has pip==25.0.1 wheel==0.45.1 setuptools==75.3.0
# lockfiles/st2.lock has pip==25.0.1 wheel==0.45.1 setuptools==75.3.0
virtualenv==20.29.2
# virtualenv==20.30.0 (<21) has pip==25.0.1 wheel==0.45.1 setuptools==75.3.2
# lockfiles/st2.lock has pip==25.0.1 wheel==0.45.1 setuptools==75.3.2
virtualenv==20.30.0
# This setuptools version number is in the Makefile, but CircleCI builds are pulling a version
# that is incompatible with our logshipper fork.
setuptools<78
webob==1.8.9
webtest==3.0.1
zake==0.2.2
# test requirements below
bcrypt==4.2.1
jinja2==3.1.5
mock==5.1.0
bcrypt==4.3.0
jinja2==3.1.6
mock==5.2.0
pytest==7.0.1
psutil==7.0.0
python-dateutil==2.9.0.post0
Expand Down
349 changes: 228 additions & 121 deletions lockfiles/st2.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@
RandomWords
amqp==5.3.1
apscheduler==3.11.0
argcomplete==3.5.3
argcomplete==3.6.2
backports.zoneinfo[tzdata]; python_version<"3.9"
bcrypt==4.2.1
bcrypt==4.3.0
cffi==1.17.1
chardet==5.2.0
ciso8601
cryptography==43.0.3
decorator==5.2.1
dnspython
editor==1.6.6
eventlet==0.39.0
eventlet==0.39.1
flex==6.14.1
gitdb==4.0.12
gitpython==3.1.44
greenlet==3.1.1
gunicorn==23.0.0
importlib-metadata==7.1.0
jinja2==3.1.5
jinja2==3.1.6
jsonpath-rw==1.4.0
jsonschema==3.2.0
kombu==5.4.2
kombu==5.5.2
lockfile==0.12.2
logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux"
mock==5.1.0
mock==5.2.0
mongoengine==0.29.1
networkx==3.1
orjson==3.10.15
Expand All @@ -54,7 +54,7 @@ pytest==7.0.1
python-dateutil==2.9.0.post0
python-json-logger
python-statsd==2.1.0
pytz==2025.1
pytz==2025.2
pywinrm==0.5.0
pyyaml==6.0.2
redis==5.2.1
Expand Down
6 changes: 3 additions & 3 deletions st2actions/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
apscheduler==3.11.0
backports.zoneinfo[tzdata]; python_version<"3.9"
chardet==5.2.0
eventlet==0.39.0
eventlet==0.39.1
gitpython==3.1.44
jinja2==3.1.5
kombu==5.4.2
jinja2==3.1.6
kombu==5.5.2
lockfile==0.12.2
logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux"
oslo.config==9.6.0
Expand Down
4 changes: 2 additions & 2 deletions st2api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
backports.zoneinfo[tzdata]; python_version<"3.9"
eventlet==0.39.0
eventlet==0.39.1
gunicorn==23.0.0
jsonschema==3.2.0
kombu==5.4.2
kombu==5.5.2
mongoengine==0.29.1
oslo.config==9.6.0
oslo.utils==7.3.0
Expand Down
4 changes: 2 additions & 2 deletions st2auth/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# 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
bcrypt==4.2.1
eventlet==0.39.0
bcrypt==4.3.0
eventlet==0.39.1
gunicorn==23.0.0
oslo.config==9.6.0
passlib==1.7.4
Expand Down
4 changes: 2 additions & 2 deletions st2client/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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
argcomplete==3.5.3
argcomplete==3.6.2
cffi==1.17.1
chardet==5.2.0
cryptography==43.0.3
Expand All @@ -20,7 +20,7 @@ pyOpenSSL
pygments==2.19.1
pysocks
python-dateutil==2.9.0.post0
pytz==2025.1
pytz==2025.2
pyyaml==6.0.2
requests==2.32.3
six==1.17.0
Expand Down
6 changes: 3 additions & 3 deletions st2common/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ ciso8601
cryptography==43.0.3
decorator==5.2.1
dnspython
eventlet==0.39.0
eventlet==0.39.1
flex==6.14.1
gitdb==4.0.12
gitpython==3.1.44
greenlet==3.1.1
jinja2==3.1.5
jinja2==3.1.6
jsonpath-rw==1.4.0
jsonschema==3.2.0
kombu==5.4.2
kombu==5.5.2
lockfile==0.12.2
mongoengine==0.29.1
networkx==3.1
Expand Down
4 changes: 2 additions & 2 deletions st2reactor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
# update the component requirements.txt
apscheduler==3.11.0
backports.zoneinfo[tzdata]; python_version<"3.9"
eventlet==0.39.0
eventlet==0.39.1
jsonpath-rw==1.4.0
jsonschema==3.2.0
kombu==5.4.2
kombu==5.5.2
oslo.config==9.6.0
python-dateutil==2.9.0.post0
six==1.17.0
4 changes: 2 additions & 2 deletions st2stream/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
backports.zoneinfo[tzdata]; python_version<"3.9"
eventlet==0.39.0
eventlet==0.39.1
gunicorn==23.0.0
jsonschema==3.2.0
kombu==5.4.2
kombu==5.5.2
mongoengine==0.29.1
oslo.config==9.6.0
oslo.utils==7.3.0
Expand Down
2 changes: 1 addition & 1 deletion st2tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# in-requirements.txt for that component and then run 'make requirements' to
# update the component requirements.txt
RandomWords
mock==5.1.0
mock==5.2.0
psutil==7.0.0
pyrabbit
pytest==7.0.1
Expand Down
Loading
0