Skip to content

Commit 70a8d53

Browse files
fix(ci_visibility): support pytest 8.0.0 [backport 2.4] (#8481)
Backport 78d5b98 from #8357 to 2.4. Addresses #8220 and fixes an issue with `pytest` `8.x` and above (brought by pytest-dev/pytest#11137 ) where `pytest.Package` objects no longer have an attached `module` attribute. This also changes the testing matrix to include version `~=8.0`, but maintains `~=7.0` as a separate testing environment. ## Checklist - [x] Change(s) are motivated and described in the PR description - [x] Testing strategy is described if automated tests are not included in the PR - [x] Risks are described (performance impact, potential for breakage, maintainability) - [x] Change is maintainable (easy to change, telemetry, documentation) - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed or label `changelog/no-changelog` is set - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)) - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) - [x] If this PR changes the public interface, I've notified `@DataDog/apm-tees`. - [x] If change touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. ## Reviewer Checklist - [x] Title is accurate - [x] All changes are related to the pull request's stated goal - [x] Description motivates each change - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - [x] Testing strategy adequately addresses listed risks - [x] Change is maintainable (easy to change, telemetry, documentation) - [x] Release note makes sense to a user of the library - [x] Author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - [x] 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) Co-authored-by: Federico Mon <federico.mon@datadoghq.com>
1 parent 8bbf05b commit 70a8d53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+711
-368
lines changed

.riot/requirements/1040ce7.txt renamed to .riot/requirements/1013261.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1040ce7.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1013261.in
66
#
77
asynctest==0.13.0
8-
attrs==22.2.0
9-
coverage[toml]==7.2.2
8+
attrs==23.2.0
9+
coverage[toml]==7.4.2
1010
hypothesis==6.45.0
1111
iniconfig==2.0.0
12-
mock==5.0.1
12+
mock==5.1.0
1313
more-itertools==8.10.0
14-
msgpack==1.0.5
14+
msgpack==1.0.7
1515
opentracing==2.4.0
16-
packaging==23.0
17-
pluggy==1.0.0
16+
packaging==23.2
17+
pluggy==1.4.0
1818
py==1.11.0
1919
pytest==6.2.5
20-
pytest-cov==4.0.0
21-
pytest-mock==3.10.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.12.0
2222
sortedcontainers==2.4.0
2323
toml==0.10.2
2424
tomli==2.0.1

.riot/requirements/103e388.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
4+
#
5+
# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/103e388.in
6+
#
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
10+
hypothesis==6.45.0
11+
iniconfig==2.0.0
12+
mock==5.1.0
13+
more-itertools==8.10.0
14+
msgpack==1.0.7
15+
opentracing==2.4.0
16+
packaging==23.2
17+
pluggy==1.4.0
18+
pytest==7.4.4
19+
pytest-cov==2.12.0
20+
pytest-mock==2.0.0
21+
sortedcontainers==2.4.0
22+
tomli==2.0.1

.riot/requirements/10b44df.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#
55
# pip-compile --no-annotate .riot/requirements/10b44df.in
66
#
7-
attrs==23.1.0
8-
coverage[toml]==7.3.2
9-
exceptiongroup==1.1.3
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
1010
hypothesis==6.45.0
1111
iniconfig==2.0.0
1212
logbook==1.0.0
1313
mock==5.1.0
1414
opentracing==2.4.0
1515
packaging==23.2
16-
pluggy==1.3.0
17-
pytest==7.4.3
16+
pluggy==1.4.0
17+
pytest==8.0.1
1818
pytest-cov==4.1.0
1919
pytest-mock==3.12.0
2020
sortedcontainers==2.4.0

.riot/requirements/111163f.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#
55
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/111163f.in
66
#
7-
attrs==23.1.0
7+
attrs==23.2.0
88
coverage[toml]==7.2.7
99
elasticsearch6==6.8.2
10-
exceptiongroup==1.1.3
10+
exceptiongroup==1.2.0
1111
hypothesis==6.45.0
1212
importlib-metadata==6.7.0
1313
iniconfig==2.0.0
1414
mock==5.1.0
1515
opentracing==2.4.0
1616
packaging==23.2
1717
pluggy==1.2.0
18-
pytest==7.4.2
18+
pytest==7.4.4
1919
pytest-cov==4.1.0
2020
pytest-mock==3.11.1
2121
sortedcontainers==2.4.0
2222
tomli==2.0.1
2323
typing-extensions==4.7.1
24-
urllib3==2.0.6
24+
urllib3==2.0.7
2525
zipp==3.15.0

.riot/requirements/15d8f6b.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/15d8f6b.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/15d8f6b.in
66
#
7-
attrs==23.1.0
8-
coverage[toml]==7.2.7
9-
exceptiongroup==1.1.2
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
1010
glob2==0.7
1111
hypothesis==6.45.0
1212
iniconfig==2.0.0
13-
mako==1.2.4
14-
markupsafe==2.1.3
13+
mako==1.3.2
14+
markupsafe==2.1.5
1515
mock==5.1.0
1616
more-itertools==8.10.0
17-
msgpack==1.0.5
17+
msgpack==1.0.7
1818
opentracing==2.4.0
19-
packaging==23.1
20-
parse==1.19.1
19+
packaging==23.2
20+
parse==1.20.1
2121
parse-type==0.6.2
22-
pluggy==1.2.0
22+
pluggy==1.4.0
2323
py==1.11.0
24-
pytest==7.4.0
24+
pytest==8.0.1
2525
pytest-bdd==4.1.0
2626
pytest-cov==4.1.0
27-
pytest-mock==3.11.1
27+
pytest-mock==3.12.0
2828
six==1.16.0
2929
sortedcontainers==2.4.0
3030
tomli==2.0.1

.riot/requirements/1646d28.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
#
55
# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/1646d28.in
66
#
7-
attrs==23.1.0
8-
coverage[toml]==7.2.7
9-
exceptiongroup==1.1.2
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
1010
glob2==0.7
1111
hypothesis==6.45.0
1212
iniconfig==2.0.0
13-
mako==1.2.4
14-
markupsafe==2.1.3
13+
mako==1.3.2
14+
markupsafe==2.1.5
1515
mock==5.1.0
1616
more-itertools==8.10.0
17-
msgpack==1.0.5
17+
msgpack==1.0.7
1818
opentracing==2.4.0
19-
packaging==23.1
20-
parse==1.19.1
19+
packaging==23.2
20+
parse==1.20.1
2121
parse-type==0.6.2
22-
pluggy==1.2.0
22+
pluggy==1.4.0
2323
py==1.11.0
24-
pytest==7.4.0
24+
pytest==8.0.1
2525
pytest-bdd==4.1.0
2626
pytest-cov==4.1.0
27-
pytest-mock==3.11.1
27+
pytest-mock==3.12.0
2828
six==1.16.0
2929
sortedcontainers==2.4.0
3030
tomli==2.0.1

.riot/requirements/1710908.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#
55
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1710908.in
66
#
7-
attrs==22.2.0
8-
coverage==7.2.2
7+
attrs==23.2.0
8+
coverage==7.2.7
99
hypothesis==6.45.0
10-
importlib-metadata==6.0.0
10+
importlib-metadata==6.7.0
1111
iniconfig==2.0.0
12-
mock==5.0.1
12+
mock==5.1.0
1313
more-itertools==8.10.0
1414
msgpack==1.0.5
1515
opentracing==2.4.0
16-
packaging==23.0
17-
pluggy==1.0.0
16+
packaging==23.2
17+
pluggy==1.2.0
1818
py==1.11.0
1919
pytest==6.2.5
2020
pytest-cov==2.9.0
2121
pytest-mock==2.0.0
2222
sortedcontainers==2.4.0
2323
toml==0.10.2
24-
typing-extensions==4.7.0
24+
typing-extensions==4.7.1
2525
zipp==3.15.0

.riot/requirements/1740ff3.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
#
55
# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/1740ff3.in
66
#
7-
attrs==23.1.0
8-
coverage[toml]==7.2.7
9-
exceptiongroup==1.1.2
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
1010
hypothesis==6.45.0
1111
iniconfig==2.0.0
1212
mock==5.1.0
13-
msgpack==1.0.5
13+
msgpack==1.0.7
1414
opentracing==2.4.0
15-
packaging==23.1
16-
pluggy==1.2.0
15+
packaging==23.2
16+
pluggy==1.4.0
1717
py-cpuinfo==9.0.0
18-
pytest==7.4.0
18+
pytest==8.0.1
1919
pytest-benchmark==4.0.0
2020
pytest-cov==4.1.0
21-
pytest-mock==3.11.1
21+
pytest-mock==3.12.0
2222
sortedcontainers==2.4.0
2323
tomli==2.0.1

.riot/requirements/17ee3ec.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#
55
# pip-compile --no-annotate .riot/requirements/17ee3ec.in
66
#
7-
attrs==23.1.0
8-
coverage[toml]==7.3.2
9-
exceptiongroup==1.1.3
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
1010
hypothesis==6.45.0
1111
iniconfig==2.0.0
12-
logbook==1.7.0
12+
logbook==1.7.0.post0
1313
mock==5.1.0
1414
opentracing==2.4.0
1515
packaging==23.2
16-
pluggy==1.3.0
17-
pytest==7.4.3
16+
pluggy==1.4.0
17+
pytest==8.0.1
1818
pytest-cov==4.1.0
1919
pytest-mock==3.12.0
2020
sortedcontainers==2.4.0

.riot/requirements/188677b.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/188677b.in
5+
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/188677b.in
66
#
7-
attrs==23.1.0
8-
coverage[toml]==7.2.7
9-
exceptiongroup==1.1.2
7+
attrs==23.2.0
8+
coverage[toml]==7.4.2
9+
exceptiongroup==1.2.0
1010
glob2==0.7
1111
hypothesis==6.45.0
1212
iniconfig==2.0.0
13-
mako==1.2.4
14-
markupsafe==2.1.3
13+
mako==1.3.2
14+
markupsafe==2.1.5
1515
mock==5.1.0
1616
more-itertools==8.10.0
17-
msgpack==1.0.5
17+
msgpack==1.0.7
1818
opentracing==2.4.0
19-
packaging==23.1
20-
parse==1.19.1
19+
packaging==23.2
20+
parse==1.20.1
2121
parse-type==0.6.2
22-
pluggy==1.2.0
22+
pluggy==1.4.0
2323
py==1.11.0
24-
pytest==7.4.0
24+
pytest==8.0.1
2525
pytest-bdd==6.0.1
2626
pytest-cov==4.1.0
27-
pytest-mock==3.11.1
27+
pytest-mock==3.12.0
2828
six==1.16.0
2929
sortedcontainers==2.4.0
3030
tomli==2.0.1

0 commit comments

Comments
 (0)