Skip to content

Commit

Permalink
fix(ci_visibility): support pytest 8.0.0 (#8357)
Browse files Browse the repository at this point in the history
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: Munir Abdinur <munir.abdinur@datadoghq.com>
  • Loading branch information
romainkomorndatadog and mabdinur authored Feb 21, 2024
1 parent 99b1d84 commit 78d5b98
Show file tree
Hide file tree
Showing 39 changed files with 550 additions and 206 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ jobs:

pytest:
<<: *machine_executor
parallelism: 8
parallelism: 10
steps:
- run_test:
pattern: 'pytest'
Expand Down
10 changes: 5 additions & 5 deletions .riot/requirements/117f119.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# pip-compile --no-annotate .riot/requirements/117f119.in
#
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
exceptiongroup==1.2.0
hypothesis==6.45.0
importlib-metadata==7.0.0
importlib-metadata==7.0.1
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
pluggy==1.4.0
pytest==8.0.0
pytest-cov==2.12.0
pytest-mock==2.0.0
pytest-randomly==3.15.0
Expand Down
22 changes: 22 additions & 0 deletions .riot/requirements/1254841.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/1254841.in
#
asynctest==0.13.0
attrs==23.2.0
coverage[toml]==7.4.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.4.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
pytest-randomly==3.15.0
sortedcontainers==2.4.0
4 changes: 2 additions & 2 deletions .riot/requirements/135c565.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/135c565.in
#
attrs==23.1.0
attrs==23.2.0
coverage[toml]==7.2.7
exceptiongroup==1.2.0
hypothesis==6.45.0
Expand All @@ -16,7 +16,7 @@ opentracing==2.4.0
packaging==23.2
pluggy==1.2.0
py-cpuinfo==9.0.0
pytest==7.4.3
pytest==7.4.4
pytest-benchmark==4.0.0
pytest-cov==4.1.0
pytest-mock==3.11.1
Expand Down
22 changes: 22 additions & 0 deletions .riot/requirements/14d5757.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/14d5757.in
#
asynctest==0.13.0
attrs==23.2.0
coverage[toml]==7.4.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.4.0
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.12.0
pytest-randomly==3.15.0
sortedcontainers==2.4.0
8 changes: 4 additions & 4 deletions .riot/requirements/166af91.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
#
# pip-compile --no-annotate .riot/requirements/166af91.in
#
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
exceptiongroup==1.2.0
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pluggy==1.4.0
py-cpuinfo==9.0.0
pytest==7.4.3
pytest==8.0.0
pytest-benchmark==4.0.0
pytest-cov==4.1.0
pytest-mock==3.12.0
Expand Down
8 changes: 4 additions & 4 deletions .riot/requirements/1727339.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
#
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1727339.in
#
attrs==23.1.0
attrs==23.2.0
coverage[toml]==7.2.7
exceptiongroup==1.2.0
glob2==0.7
hypothesis==6.45.0
importlib-metadata==6.7.0
iniconfig==2.0.0
mako==1.2.4
markupsafe==2.1.3
markupsafe==2.1.5
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.5
opentracing==2.4.0
packaging==23.2
parse==1.20.0
parse==1.20.1
parse-type==0.6.2
pluggy==1.2.0
py==1.11.0
pytest==7.4.3
pytest==7.4.4
pytest-bdd==6.0.1
pytest-cov==4.1.0
pytest-mock==3.11.1
Expand Down
8 changes: 4 additions & 4 deletions .riot/requirements/17ecd2b.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
# pip-compile --no-annotate .riot/requirements/17ecd2b.in
#
asynctest==0.13.0
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
pluggy==1.4.0
pytest==8.0.0
pytest-cov==4.1.0
pytest-mock==3.12.0
pytest-randomly==3.15.0
Expand Down
26 changes: 26 additions & 0 deletions .riot/requirements/18cd4dd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/18cd4dd.in
#
attrs==23.2.0
coverage[toml]==7.2.7
exceptiongroup==1.2.0
hypothesis==6.45.0
importlib-metadata==6.7.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.5
opentracing==2.4.0
packaging==23.2
pluggy==1.2.0
pytest==7.4.4
pytest-cov==2.12.0
pytest-mock==2.0.0
pytest-randomly==3.12.0
sortedcontainers==2.4.0
tomli==2.0.1
typing-extensions==4.7.1
zipp==3.15.0
14 changes: 7 additions & 7 deletions .riot/requirements/1cc7f49.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
#
# pip-compile --no-annotate .riot/requirements/1cc7f49.in
#
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
glob2==0.7
hypothesis==6.45.0
iniconfig==2.0.0
mako==1.3.0
markupsafe==2.1.3
mako==1.3.2
markupsafe==2.1.5
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
parse==1.20.0
parse==1.20.1
parse-type==0.6.2
pluggy==1.3.0
pluggy==1.4.0
py==1.11.0
pytest==7.4.3
pytest==8.0.0
pytest-bdd==6.0.1
pytest-cov==4.1.0
pytest-mock==3.12.0
Expand Down
16 changes: 8 additions & 8 deletions .riot/requirements/1ce9a95.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
#
# pip-compile --no-annotate .riot/requirements/1ce9a95.in
#
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
exceptiongroup==1.2.0
glob2==0.7
hypothesis==6.45.0
importlib-metadata==7.0.0
importlib-metadata==7.0.1
iniconfig==2.0.0
mako==1.3.0
markupsafe==2.1.3
mako==1.3.2
markupsafe==2.1.5
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
parse==1.20.0
parse==1.20.1
parse-type==0.6.2
pluggy==1.3.0
pluggy==1.4.0
py==1.11.0
pytest==7.4.3
pytest==8.0.0
pytest-bdd==4.1.0
pytest-cov==4.1.0
pytest-mock==3.12.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/1002189.in
# pip-compile --no-annotate .riot/requirements/1ceca0e.in
#
asynctest==0.13.0
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pluggy==1.4.0
py==1.11.0
pytest==6.2.5
pytest-cov==4.1.0
Expand Down
14 changes: 7 additions & 7 deletions .riot/requirements/1d44438.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
#
# pip-compile --no-annotate .riot/requirements/1d44438.in
#
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
glob2==0.7
hypothesis==6.45.0
iniconfig==2.0.0
mako==1.3.0
markupsafe==2.1.3
mako==1.3.2
markupsafe==2.1.5
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
parse==1.20.0
parse==1.20.1
parse-type==0.6.2
pluggy==1.3.0
pluggy==1.4.0
py==1.11.0
pytest==7.4.3
pytest==8.0.0
pytest-bdd==6.0.1
pytest-cov==4.1.0
pytest-mock==3.12.0
Expand Down
8 changes: 4 additions & 4 deletions .riot/requirements/1e0c0d6.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
# pip-compile --no-annotate .riot/requirements/1e0c0d6.in
#
asynctest==0.13.0
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pytest==7.4.3
pluggy==1.4.0
pytest==8.0.0
pytest-cov==4.1.0
pytest-mock==3.12.0
pytest-randomly==3.15.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/c485ca7.in
# pip-compile --no-annotate .riot/requirements/1e49987.in
#
asynctest==0.13.0
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
hypothesis==6.45.0
iniconfig==2.0.0
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
pluggy==1.3.0
pluggy==1.4.0
py==1.11.0
pytest==6.2.5
pytest-cov==4.1.0
Expand Down
14 changes: 7 additions & 7 deletions .riot/requirements/1e535fe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
#
# pip-compile --no-annotate .riot/requirements/1e535fe.in
#
attrs==23.1.0
coverage[toml]==7.3.4
attrs==23.2.0
coverage[toml]==7.4.1
glob2==0.7
hypothesis==6.45.0
iniconfig==2.0.0
mako==1.3.0
markupsafe==2.1.3
mako==1.3.2
markupsafe==2.1.5
mock==5.1.0
more-itertools==8.10.0
msgpack==1.0.7
opentracing==2.4.0
packaging==23.2
parse==1.20.0
parse==1.20.1
parse-type==0.6.2
pluggy==1.3.0
pluggy==1.4.0
py==1.11.0
pytest==7.4.3
pytest==8.0.0
pytest-bdd==4.1.0
pytest-cov==4.1.0
pytest-mock==3.12.0
Expand Down
Loading

0 comments on commit 78d5b98

Please sign in to comment.