Skip to content

Commit 4e8a947

Browse files
authored
ci: upgrade pytest version used in tests (#13456)
Fixes test failures in the `flask` suite by upgrading away from an unsupported pytest version ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent beadbcc commit 4e8a947

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

.riot/requirements/142556c.txt renamed to .riot/requirements/1f5205e.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/142556c.in
5+
# pip-compile --no-annotate .riot/requirements/1f5205e.in
66
#
7-
atomicwrites==1.4.1
8-
attrs==24.2.0
7+
attrs==25.3.0
98
blinker==1.9.0
10-
click==8.1.7
11-
coverage[toml]==7.6.7
12-
exceptiongroup==1.2.2
9+
click==8.1.8
10+
coverage[toml]==7.8.0
11+
exceptiongroup==1.3.0
1312
flask==0.12.5
1413
flask-cache==0.13.1
1514
hypothesis==6.45.0
16-
importlib-metadata==8.5.0
15+
importlib-metadata==8.7.0
16+
iniconfig==2.1.0
1717
itsdangerous==1.1.0
1818
jinja2==2.10.3
1919
markupsafe==1.1.1
20-
mock==5.1.0
20+
mock==5.2.0
2121
more-itertools==8.10.0
2222
opentracing==2.4.0
23-
packaging==24.2
24-
pluggy==0.13.1
23+
packaging==25.0
24+
pluggy==1.6.0
2525
py==1.11.0
26-
pytest==4.6.11
26+
pytest==6.2.5
2727
pytest-cov==3.0.0
2828
pytest-mock==2.0.0
2929
pytest-randomly==3.16.0
3030
python-memcached==1.62
3131
redis==2.10.6
32-
six==1.16.0
3332
sortedcontainers==2.4.0
34-
tomli==2.1.0
35-
wcwidth==0.2.13
33+
toml==0.10.2
34+
tomli==2.2.1
35+
typing-extensions==4.13.2
3636
werkzeug==0.16.1
3737
zipp==3.21.0

.riot/requirements/af02264.txt renamed to .riot/requirements/f903257.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/af02264.in
5+
# pip-compile --no-annotate .riot/requirements/f903257.in
66
#
7-
atomicwrites==1.4.1
8-
attrs==24.2.0
7+
attrs==25.3.0
98
blinker==1.8.2
10-
click==8.1.7
9+
click==8.1.8
1110
coverage[toml]==7.6.1
12-
exceptiongroup==1.2.2
11+
exceptiongroup==1.3.0
1312
flask==0.12.5
1413
flask-cache==0.13.1
1514
hypothesis==6.45.0
1615
importlib-metadata==8.5.0
16+
iniconfig==2.1.0
1717
itsdangerous==1.1.0
1818
jinja2==2.10.3
1919
markupsafe==1.1.1
20-
mock==5.1.0
20+
mock==5.2.0
2121
more-itertools==8.10.0
2222
opentracing==2.4.0
23-
packaging==24.2
24-
pluggy==0.13.1
23+
packaging==25.0
24+
pluggy==1.5.0
2525
py==1.11.0
26-
pytest==4.6.11
26+
pytest==6.2.5
2727
pytest-cov==3.0.0
2828
pytest-mock==2.0.0
2929
pytest-randomly==3.15.0
3030
python-memcached==1.62
3131
redis==2.10.6
32-
six==1.16.0
3332
sortedcontainers==2.4.0
34-
tomli==2.1.0
35-
wcwidth==0.2.13
33+
toml==0.10.2
34+
tomli==2.2.1
35+
typing-extensions==4.13.2
3636
werkzeug==0.16.1
3737
zipp==3.20.2

lib-injection/sources/min_compatible_versions.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pynamodb,~=5.0
141141
pyodbc,~=4.0.31
142142
pyramid,~=1.10
143143
pysqlite3-binary,0
144-
pytest,~=4.0
144+
pytest,>=6.0
145145
pytest-aiohttp,0
146146
pytest-bdd,>=4.0
147147
pytest-benchmark,>=3.1.0

min_compatible_versions.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pynamodb,~=5.0
141141
pyodbc,~=4.0.31
142142
pyramid,~=1.10
143143
pysqlite3-binary,0
144-
pytest,~=4.0
144+
pytest,>=6.0
145145
pytest-aiohttp,0
146146
pytest-bdd,>=4.0
147147
pytest-benchmark,>=3.1.0

riotfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
955955
"Werkzeug": ["<1.0"],
956956
"Flask-Cache": "~=0.13.1",
957957
"werkzeug": "<1.0",
958-
"pytest": "~=4.0",
958+
"pytest": "~=6.0",
959959
"pytest-mock": "==2.0.0",
960960
"pytest-cov": "~=3.0",
961961
"Jinja2": "~=2.10.0",

0 commit comments

Comments
 (0)