Skip to content

Commit

Permalink
Bump deps (auth, orquesta, lint/test, etc) to support newer python (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
guzzijones authored Oct 24, 2024
2 parents 80f0547 + fab2180 commit 791ce96
Show file tree
Hide file tree
Showing 22 changed files with 1,005 additions and 1,220 deletions.
13 changes: 7 additions & 6 deletions BUILD.tools
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ python_requirement(
name="bandit-reqs",
resolve="bandit",
requirements=[
"bandit==1.7.0",
# https://github.com/pantsbuild/pants/blob/release_2.23.0rc0/src/python/pants/backend/python/lint/bandit/subsystem.py#L44-L52
"bandit>=1.7.0,<1.8",
"setuptools",
"GitPython==3.1.18",
"GitPython>=3.1.24",
],
)

Expand All @@ -23,9 +24,9 @@ python_requirement(
name="flake8-reqs",
resolve="flake8",
requirements=[
"flake8==4.0.1", # st2flake8 does not support flake8 v5
"flake8==7.0.0", # st2flake8 does not support flake8 v5
# license check plugin
"st2flake8==0.1.0", # TODO: remove in favor of regex-lint or preamble
"st2flake8>0.1.0", # TODO: remove in favor of regex-lint or preamble
],
)

Expand All @@ -34,13 +35,13 @@ python_requirement(

python_requirement(
name="pytest-reqs",
resolve="pytest",
resolve="st2",
requirements=[
"pytest==7.0.1", # copied from https://www.pantsbuild.org/v2.14/docs/reference-pytest#version
"pytest-benchmark[histogram]==3.4.1", # used for st2common/benchmarks
# "pytest-timer[colorama]", # report test timing (--with-timer ala nose-timer)
"pytest-icdiff", # make diff output easier to read
"pygments", # highlight code in tracebacks
# "pygments", # highlight code in tracebacks (already included in requirements-pants.txt)
#
# other possible plugins
# "pytest-timeout", # time limit on tests
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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 #6227 #6200 #6252 (by @cognifloyd and @nzlosh)
* Bumped many deps based on the lockfiles generated by pants+pex. #6181 #6227 #6200 #6252 #6268 (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
2 changes: 1 addition & 1 deletion contrib/runners/orquesta_runner/in-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0
orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975
2 changes: 1 addition & 1 deletion contrib/runners/orquesta_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
orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.6.0
orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2ca89e68baa671e8975
25 changes: 13 additions & 12 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# Packages versions fixed for the whole st2 stack
# Package versions fixed (pinned) for the whole st2 project.
# Important: Keep version constraints synchronised with the below repositories:
# - https://github.com/StackStorm/st2docs
# - https://github.com/StackStorm/orquesta
# - https://github.com/StackStorm/st2-auth-ldap
# - https://github.com/StackStorm/st2-rbac-backend
# ----------------------------------------------------------------------
# Note: amqp is used by kombu
amqp==5.2.0
apscheduler==3.10.4
chardet==3.0.4
chardet==5.2.0
cffi==1.17.1
cryptography==43.0.3
eventlet==0.37.0
Expand All @@ -19,14 +25,9 @@ jsonpath-rw==1.4.0
jsonschema==3.2.0
kombu==5.4.2
lockfile==0.12.2
# Fix MarkupSafe to < 2.1.0 as 2.1.0 removes soft_unicode
# >=0.23 was from jinja2
MarkupSafe==2.0.1
mongoengine==0.29.1
# required by orquesta (networkx<2.6 for py3.6, networkx<3 for py3.8)
networkx==2.8.8
# networkx dropped its dep on decorator in version 2.6, so the old pin is unneeded.
# now jsonpath-rw is the only thing that depends on decorator (a transitive dep)
networkx==3.1
# 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.6.0
Expand All @@ -50,7 +51,7 @@ python-keyczar==0.716
pytz==2024.2
pywinrm==0.5.0
pyyaml==6.0.2
redis==5.1.1
redis==5.2.0
requests==2.32.3
retrying==1.3.4
routes==2.5.1
Expand All @@ -70,7 +71,7 @@ tooz==6.3.0
# 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
webob==1.8.9
zake==0.2.2
# test requirements below
bcrypt==4.2.0
Expand All @@ -81,5 +82,5 @@ nose-parallel==0.4.0
psutil==6.1.0
python-dateutil==2.9.0.post0
python-statsd==2.1.0
orjson==3.10.7
orjson==3.10.10
zipp==3.20.2
Loading

0 comments on commit 791ce96

Please sign in to comment.