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
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ jobs:
- ST2_CHECKOUT: 0
- ST2_GITDIR: /tmp/st2
- BASH_ENV: ~/.buildenv
- DOCKER_API_VERSION: "1.43"
steps:
- checkout
- run:
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ Changed

* Switched tests from `nosetest` to `pytest`. `st2-run-pack-tests` also uses pytest.
So, all pack tests must be runnable by `pytest`, which may require migration. #6291
Contributed by @nzlosh, @FileMagic, @guzzijones, and @cognifloyd.
Contributed by @nzlosh, @FileMagic, @guzzijones, and @cognifloyd. Pinned pytest-cov
to 5.0.0 for python 3.8 support.

* Migrated github actions from image ubunutu 20.04 with python 3.8.10 to image ubuntu 22.04 with python 3.8.12. #6301
Contributed by @nzlosh
Expand Down Expand Up @@ -126,6 +127,9 @@ Added
* Cherry-pick changes to runners.sh from st2-packages git repo. #6302
Cherry-picked by @cognifloyd

* Pinned DOCKER_API_VERSION in the circleci build to make sure the docker-cli api version does not exceed what
`cicrleci docker24 <https://circleci.com/docs/guides/execution-managed/building-docker-images/>`_ supports

3.8.1 - December 13, 2023
-------------------------
Fixed
Expand Down
1 change: 1 addition & 0 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,4 @@ python-dateutil==2.9.0.post0
python-statsd==2.1.0
orjson==3.10.15
zipp==3.20.2
pynacl==1.6.0
590 changes: 345 additions & 245 deletions lockfiles/st2.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ pyOpenSSL<25.2
pygments==2.19.2
pyinotify==0.9.6 ; platform_system=="Linux"
pymongo==4.6.3
pynacl==1.6.0
pyparsing==3.1.4
pyrabbit
pysocks
Expand Down
3 changes: 2 additions & 1 deletion st2common/bin/st2-run-pack-tests
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ PACK_TEST_PYTHON_DEPENDENCIES_NAMES=(
'mock'
'pytest-cov'
)
# While Stackstorm supports Python 3.8, pytest-cov must be run at a lower version
PACK_TEST_PYTHON_DEPENDENCIES_VERSIONS=(
'>7'
'>=4.0.3'
'>=6.1.1'
'>=5.0.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the GHA workflow to regenerate the lockfile should learn to deal with this file somehow.

This file is not a simple "copy the locked version", so we'd need to be careful to not turn that workflow into a maintenance headache.

)

VIRTUALENVS_DIR="/tmp/st2-pack-tests-virtualenvs"
Expand Down
2 changes: 2 additions & 0 deletions st2common/in-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2c
st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master
oslo.config
paramiko
# pynacl is used by paramiko and version needs to be pinned
pynacl
pyyaml
pymongo
# used for optional network level compression for mongodb
Expand Down
1 change: 1 addition & 0 deletions st2common/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ oslo.config==9.6.0
paramiko==3.5.1
pyOpenSSL<25.2
pymongo==4.6.3
pynacl==1.6.0
python-dateutil==2.9.0.post0
python-statsd==2.1.0
pyyaml==6.0.3
Expand Down
Loading