Skip to content

Commit a97e9e0

Browse files
authored
Update pytest-cov version requirement and fix other build failures (#6363)
* Update pytest-cov version requirement While Stackstorm supports python 3.8 (rocky8), pytest-cov needs to be downgraded to 5.0.0 * Update changelog * Pin DOCKER_API_VERSION * Pin pynacl, newer versions cause build conflicts * Undo local compatability changes * Note in changelog about pinning the DOCKER_API_VERSION * Regen pants lockfile
1 parent 240315e commit a97e9e0

File tree

8 files changed

+358
-247
lines changed

8 files changed

+358
-247
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ jobs:
123123
- ST2_CHECKOUT: 0
124124
- ST2_GITDIR: /tmp/st2
125125
- BASH_ENV: ~/.buildenv
126+
- DOCKER_API_VERSION: "1.43"
126127
steps:
127128
- checkout
128129
- run:

CHANGELOG.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ Changed
7171

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

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

130+
* Pinned DOCKER_API_VERSION in the circleci build to make sure the docker-cli api version does not exceed what
131+
`cicrleci docker24 <https://circleci.com/docs/guides/execution-managed/building-docker-images/>`_ supports
132+
129133
3.8.1 - December 13, 2023
130134
-------------------------
131135
Fixed

fixed-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ python-dateutil==2.9.0.post0
8989
python-statsd==2.1.0
9090
orjson==3.10.15
9191
zipp==3.20.2
92+
pynacl==1.6.0

lockfiles/st2.lock

Lines changed: 345 additions & 245 deletions
Large diffs are not rendered by default.

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ pyOpenSSL<25.2
4646
pygments==2.19.2
4747
pyinotify==0.9.6 ; platform_system=="Linux"
4848
pymongo==4.6.3
49+
pynacl==1.6.0
4950
pyparsing==3.1.4
5051
pyrabbit
5152
pysocks

st2common/bin/st2-run-pack-tests

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ PACK_TEST_PYTHON_DEPENDENCIES_NAMES=(
3838
'mock'
3939
'pytest-cov'
4040
)
41+
# While Stackstorm supports Python 3.8, pytest-cov must be run at a lower version
4142
PACK_TEST_PYTHON_DEPENDENCIES_VERSIONS=(
4243
'>7'
4344
'>=4.0.3'
44-
'>=6.1.1'
45+
'>=5.0.0'
4546
)
4647

4748
VIRTUALENVS_DIR="/tmp/st2-pack-tests-virtualenvs"

st2common/in-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2c
1616
st2-rbac-backend@ git+https://github.com/StackStorm/st2-rbac-backend.git@master
1717
oslo.config
1818
paramiko
19+
# pynacl is used by paramiko and version needs to be pinned
20+
pynacl
1921
pyyaml
2022
pymongo
2123
# used for optional network level compression for mongodb

st2common/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ oslo.config==9.6.0
3232
paramiko==3.5.1
3333
pyOpenSSL<25.2
3434
pymongo==4.6.3
35+
pynacl==1.6.0
3536
python-dateutil==2.9.0.post0
3637
python-statsd==2.1.0
3738
pyyaml==6.0.3

0 commit comments

Comments
 (0)