Skip to content

Commit 2aea4b9

Browse files
fix(ci): specify latest typing-extensions, exceptiongroup [backport #6253 to 1.13] (#6314)
Backports #6253 to 1.13. Fix for the typing-extensions issues we've been seeing on CI. The issue is rooted in a riot bug related to #6007 where riot has an incompatibility with our `typing-extensions` package dependency. Only certain test suites (cherrypy, debugger, django, aioredis) have this issue, so I've temporarily specified `typing-extensions:latest` as an explicit test suite dependency. This doesn't resolve the issue with riot, but does at least avoid us having to do something like #6007 every time `typing-extensions` releases a new version. In addition: Temporary fix to exceptiongroup module not being found in the celery, flask test suites. The reason behind this issue is currently unknown, possibly related to #6007. ## 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] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [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)) ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly 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: Brett Langdon <[email protected]>
1 parent cc2504b commit 2aea4b9

Some content is hidden

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

50 files changed

+444
-461
lines changed

.riot/requirements/168606b.txt renamed to .riot/requirements/115a36d.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/168606b.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/115a36d.in
66
#
77
attrs==23.1.0
8-
coverage[toml]==7.2.3
9-
exceptiongroup==1.1.1
8+
coverage[toml]==7.2.7
9+
exceptiongroup==1.1.2
1010
httpretty==0.9.7
1111
hypothesis==6.45.0
1212
iniconfig==2.0.0
1313
mock==5.0.2
1414
msgpack==1.0.5
1515
opentracing==2.4.0
1616
packaging==23.1
17-
pluggy==1.0.0
18-
pytest==7.3.1
17+
pluggy==1.2.0
18+
pytest==7.4.0
1919
pytest-asyncio==0.21.0
20-
pytest-cov==4.0.0
21-
pytest-mock==3.10.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
2222
six==1.16.0
2323
sortedcontainers==2.4.0
2424
tomli==2.0.1
25+
typing-extensions==4.7.1

.riot/requirements/360164a.txt renamed to .riot/requirements/124ed31.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/360164a.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/124ed31.in
66
#
7-
attrs==22.2.0
8-
coverage==7.2.2
7+
attrs==23.1.0
8+
coverage==7.2.7
9+
exceptiongroup==1.1.2
910
hypothesis==6.45.0
1011
iniconfig==2.0.0
11-
mock==5.0.1
12+
mock==5.0.2
1213
more-itertools==8.10.0
1314
msgpack==1.0.5
1415
opentracing==2.4.0
15-
packaging==23.0
16-
pluggy==1.0.0
16+
packaging==23.1
17+
pluggy==1.2.0
1718
py==1.11.0
1819
pytest==6.2.5
1920
pytest-cov==2.9.0

.riot/requirements/127d8b4.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.

.riot/requirements/12b0262.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/12b0262.in
6+
#
7+
aioredis==1.3.1
8+
async-timeout==4.0.2
9+
attrs==23.1.0
10+
coverage[toml]==7.2.7
11+
exceptiongroup==1.1.2
12+
hiredis==2.2.3
13+
hypothesis==6.45.0
14+
iniconfig==2.0.0
15+
mock==5.0.2
16+
opentracing==2.4.0
17+
packaging==23.1
18+
pluggy==1.2.0
19+
pytest==7.4.0
20+
pytest-asyncio==0.21.0
21+
pytest-cov==4.1.0
22+
pytest-mock==3.11.1
23+
sortedcontainers==2.4.0
24+
tomli==2.0.1
25+
typing-extensions==4.7.1

.riot/requirements/12c6f65.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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 --resolver=backtracking .riot/requirements/12c6f65.in
6+
#
7+
aioredis==2.0.1
8+
async-timeout==4.0.2
9+
attrs==23.1.0
10+
coverage[toml]==7.2.7
11+
exceptiongroup==1.1.2
12+
hypothesis==6.45.0
13+
iniconfig==2.0.0
14+
mock==5.0.2
15+
opentracing==2.4.0
16+
packaging==23.1
17+
pluggy==1.2.0
18+
pytest==7.4.0
19+
pytest-asyncio==0.21.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
22+
sortedcontainers==2.4.0
23+
tomli==2.0.1
24+
typing-extensions==4.7.1

.riot/requirements/131b01d.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/131b01d.in
6+
#
7+
aioredis==2.0.1
8+
async-timeout==4.0.2
9+
attrs==23.1.0
10+
coverage[toml]==7.2.7
11+
exceptiongroup==1.1.2
12+
hypothesis==6.45.0
13+
iniconfig==2.0.0
14+
mock==5.0.2
15+
opentracing==2.4.0
16+
packaging==23.1
17+
pluggy==1.2.0
18+
pytest==7.4.0
19+
pytest-asyncio==0.21.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
22+
sortedcontainers==2.4.0
23+
tomli==2.0.1
24+
typing-extensions==4.7.1

.riot/requirements/9f37b22.txt renamed to .riot/requirements/134bed0.txt

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,32 @@
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/9f37b22.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/134bed0.in
66
#
7-
attrs==22.2.0
8-
cheroot==9.0.0
7+
attrs==23.1.0
8+
cheroot==10.0.0
99
cherrypy==17.4.2
1010
contextlib2==21.6.0
11-
coverage[toml]==7.2.2
12-
exceptiongroup==1.1.1
11+
coverage[toml]==7.2.7
12+
exceptiongroup==1.1.2
1313
hypothesis==6.45.0
1414
iniconfig==2.0.0
15-
jaraco-functools==3.6.0
16-
mock==5.0.1
15+
jaraco-functools==3.8.0
16+
mock==5.0.2
1717
more-itertools==8.10.0
1818
opentracing==2.4.0
19-
packaging==23.0
20-
pluggy==1.0.0
21-
portend==3.1.0
22-
pytest==7.2.2
23-
pytest-cov==4.0.0
24-
pytest-mock==3.10.0
25-
pytz==2022.7.1
19+
packaging==23.1
20+
pluggy==1.2.0
21+
portend==3.2.0
22+
pytest==7.4.0
23+
pytest-cov==4.1.0
24+
pytest-mock==3.11.1
25+
pytz==2023.3
2626
six==1.16.0
2727
sortedcontainers==2.4.0
28-
tempora==5.2.1
28+
tempora==5.5.0
2929
tomli==2.0.1
30+
typing-extensions==4.7.1
3031
zc-lockfile==3.0.post1
3132

3233
# The following packages are considered to be unsafe in a requirements file:

.riot/requirements/141a618.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ atomicwrites==1.4.1
88
attrs==23.1.0
99
blinker==1.6.2
1010
click==8.1.3
11-
coverage==7.2.3
11+
coverage==7.2.5
12+
exceptiongroup==1.1.2
1213
flask==0.12.5
1314
flask-cache==0.13.1
1415
hypothesis==6.45.0

.riot/requirements/14b8cbe.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.

.riot/requirements/1a7152b.txt renamed to .riot/requirements/150481d.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,24 @@
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/1a7152b.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/150481d.in
66
#
77
attrs==23.1.0
8-
coverage[toml]==7.2.3
9-
exceptiongroup==1.1.1
8+
coverage[toml]==7.2.7
9+
exceptiongroup==1.1.2
1010
httpretty==0.9.7
1111
hypothesis==6.45.0
1212
iniconfig==2.0.0
1313
mock==5.0.2
1414
msgpack==1.0.5
1515
opentracing==2.4.0
1616
packaging==23.1
17-
pluggy==1.0.0
18-
pytest==7.3.1
17+
pluggy==1.2.0
18+
pytest==7.4.0
1919
pytest-asyncio==0.21.0
20-
pytest-cov==4.0.0
21-
pytest-mock==3.10.0
20+
pytest-cov==4.1.0
21+
pytest-mock==3.11.1
2222
six==1.16.0
2323
sortedcontainers==2.4.0
2424
tomli==2.0.1
25+
typing-extensions==4.7.1

0 commit comments

Comments
 (0)