Skip to content

Commit 820fffd

Browse files
authored
ci: unblock ci by setting typing extensions to latest [backport #5949 to 1.13] (#5951)
Backport of #5949 to 1.13 ## Background We specify the version of the `typing_extensions` package in .riot/requirements/....txt files, however this version is overridden by the base virtual env generated by riot when [ddtrace is installed](https://github.com/DataDog/riot/blob/master/riot/riot.py#L1197). This causes module not found errors when running ddtrace tests subprocesses. The underlying issue is still unknown. This could be an issue with how riot generate virtual enviornments, how we execute subprocess tests, how we set the pythonpath before running a subprocess, or none of the above. ## Impact This change temporarily unblocks ci. This issue will resurface if there is another release of typing_extensions (typing_extensions has had 3 releases in the past week). If there is another release of typing extensions will need to bump the version once again to unblock ci. This process is less than ideal. ## Next Steps This fix is brittle. The engineer on escalation rotation should look into a long term fix. Potential solutions: - Avoid generating and installing ddtrace in a base venv. Instead we could generate a ddtrace development wheel. This will install this wheel in all virtual environments used to run tests. ie revert to using tox 😭 - Ensure ddtrace dependencies (ex: typing_extensions) are excluded from [.riot/requirements](https://github.com/DataDog/dd-trace-py/tree/1.x/.riot/requirements) files. - Update riot to ensure the packages installed by [.riot/requirements](https://github.com/DataDog/dd-trace-py/tree/1.x/.riot/requirements) takes precedence over the packages installed by the base virtual 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] 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/contributing.html#Release-Note-Guidelines) are followed. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). ## 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.
1 parent 6c1ec97 commit 820fffd

File tree

297 files changed

+297
-297
lines changed

Some content is hidden

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

297 files changed

+297
-297
lines changed

.riot/requirements/10212ca.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ pytest-cov==4.0.0
2323
pytest-mock==3.10.0
2424
sortedcontainers==2.4.0
2525
tomli==2.0.1
26-
typing-extensions==4.5.0
26+
typing-extensions==4.6.2
2727
zipp==3.15.0

.riot/requirements/102421e.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ sortedcontainers==2.4.0
5858
sshpubkeys==3.3.1
5959
tomli==2.0.1
6060
types-pyyaml==6.0.12.8
61-
typing-extensions==4.5.0
61+
typing-extensions==4.6.2
6262
urllib3==1.26.15
6363
websocket-client==1.5.1
6464
werkzeug==2.1.2

.riot/requirements/102cf0a.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pytest-cov==4.0.0
2525
pytest-mock==3.10.0
2626
sortedcontainers==2.4.0
2727
tomli==2.0.1
28-
typing-extensions==4.5.0
28+
typing-extensions==4.6.2
2929
uwsgi==2.0.21
3030
zipp==3.15.0
3131

.riot/requirements/1032b18.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ redis==3.5.3
3333
six==1.16.0
3434
sortedcontainers==2.4.0
3535
tomli==2.0.1
36-
typing-extensions==4.5.0
36+
typing-extensions==4.6.2
3737
vine==5.0.0
3838
wcwidth==0.2.6
3939
zipp==3.15.0

.riot/requirements/103e4a0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ six==1.16.0
4040
sortedcontainers==2.4.0
4141
tenacity==8.2.2
4242
tomli==2.0.1
43-
typing-extensions==4.5.0
43+
typing-extensions==4.6.2
4444
urllib3==1.26.15
4545
wrapt==1.15.0
4646
xmltodict==0.13.0

.riot/requirements/1050ad9.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ pytest-mock==3.10.0
2121
six==1.16.0
2222
sortedcontainers==2.4.0
2323
tomli==2.0.1
24-
typing-extensions==4.5.0
24+
typing-extensions==4.6.2
2525
zipp==3.15.0

.riot/requirements/1067092.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ sortedcontainers==2.4.0
3535
sqlalchemy==1.4.46
3636
starlette==0.26.1
3737
tomli==2.0.1
38-
typing-extensions==4.5.0
38+
typing-extensions==4.6.2
3939
urllib3==1.26.15

.riot/requirements/10990fb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ pytest-mock==3.10.0
2424
six==1.16.0
2525
sortedcontainers==2.4.0
2626
tomli==2.0.1
27-
typing-extensions==4.5.0
27+
typing-extensions==4.6.2
2828
zipp==3.15.0

.riot/requirements/10a9168.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ sortedcontainers==2.4.0
5858
sshpubkeys==3.3.1
5959
tomli==2.0.1
6060
types-pyyaml==6.0.12.8
61-
typing-extensions==4.5.0
61+
typing-extensions==4.6.2
6262
urllib3==1.26.15
6363
websocket-client==1.5.1
6464
werkzeug==2.1.2

.riot/requirements/10b912a.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ pytest-cov==4.0.0
2121
pytest-mock==3.10.0
2222
sortedcontainers==2.4.0
2323
tomli==2.0.1
24-
typing-extensions==4.5.0
24+
typing-extensions==4.6.2
2525
vine==1.3.0
2626
zipp==3.15.0

0 commit comments

Comments
 (0)