Skip to content

Commit bb65469

Browse files
authored
Merge pull request #263 from scality/fix/ci-setuptools-missing
Fix CI: add setuptools to resolve missing pkg_resources
2 parents fcd08a5 + 6f8ddb2 commit bb65469

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Flask-WTF==1.2.2
88
ItsDangerous==2.2.0
99
Jinja2==3.1.5
1010
jira==2.0.0
11+
setuptools<82
1112
Markdown==2.6.11
1213
marshmallow==3.23.1
1314
MarkupSafe==3.0.2

tox.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,28 @@ commands = flake8 bert_e/
1818

1919
[testenv:utests]
2020
deps =
21+
setuptools<82
2122
pip==22.3.1
2223
pytest-cov==5.0.0
2324
commands = pytest bert_e/tests/unit/ {posargs}
2425

2526
[testenv:tests-api-mock]
2627
deps =
28+
setuptools<82
2729
pip==22.3.1
2830
pytest-cov==5.0.0
2931
commands = pytest -v -k mock bert_e/tests/test_git_host.py {posargs}
3032

3133
[testenv:tests-server]
3234
deps =
35+
setuptools<82
3336
pip==22.3.1
3437
pytest-cov==5.0.0
3538
commands = pytest bert_e/tests/test_server.py {posargs}
3639

3740
[testenv:tests-noqueue]
3841
deps =
42+
setuptools<82
3943
pip==22.3.1
4044
passenv = CI
4145
commands =
@@ -55,6 +59,7 @@ commands =
5559

5660
[testenv:tests]
5761
deps =
62+
setuptools<82
5863
pip==22.3.1
5964
passenv = CI
6065
commands =

0 commit comments

Comments
 (0)