Skip to content

Commit 0c14b3a

Browse files
authored
ci(tracer,opentelemetry): pin cattrs (#7667)
Latest [release](https://pypi.org/project/cattrs/23.2.0/) of cattrs broke ci. This PR pins cattrs in the impacted test suites. The goal of this PR is to unblock contributors. I will investigate the root cause next week. ## 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 - [ ] Title is accurate. - [ ] No unnecessary changes are introduced. - [ ] Description motivates each change. - [ ] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [ ] Testing strategy adequately addresses listed risk(s). - [ ] Change is maintainable (easy to change, telemetry, documentation). - [ ] Release note makes sense to a user of the library. - [ ] Reviewer has explicitly 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) - [ ] If this PR 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`. - [ ] This PR doesn't touch any of that.
1 parent 3920b07 commit 0c14b3a

Some content is hidden

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

56 files changed

+1069
-1217
lines changed

.riot/requirements/18347be.txt renamed to .riot/requirements/10afe86.txt

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,50 @@
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/18347be.in
5+
# pip-compile --no-annotate .riot/requirements/10afe86.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
cattrs==23.1.2
9+
certifi==2023.7.22
910
charset-normalizer==2.1.1
10-
click==8.1.3
11-
coverage[toml]==7.2.2
12-
deprecated==1.2.13
13-
exceptiongroup==1.1.1
11+
click==8.1.7
12+
coverage[toml]==7.3.2
13+
deprecated==1.2.14
14+
exceptiongroup==1.1.3
1415
flask==2.1.3
15-
gevent==22.10.2
16-
greenlet==2.0.2
16+
gevent==23.9.1
17+
greenlet==3.0.1
1718
hypothesis==6.45.0
1819
idna==3.4
19-
importlib-metadata==6.0.0
20+
importlib-metadata==6.8.0
2021
iniconfig==2.0.0
2122
itsdangerous==2.1.2
2223
jinja2==3.1.2
2324
markupsafe==2.0.1
24-
mock==5.0.1
25+
mock==5.1.0
2526
opentelemetry-api==1.4.1
2627
opentelemetry-instrumentation==0.32b0
2728
opentelemetry-instrumentation-flask==0.32b0
2829
opentelemetry-instrumentation-wsgi==0.32b0
2930
opentelemetry-semantic-conventions==0.32b0
3031
opentelemetry-util-http==0.32b0
3132
opentracing==2.4.0
32-
packaging==23.0
33-
pluggy==1.0.0
34-
pytest==7.2.2
35-
pytest-asyncio==0.20.3
36-
pytest-cov==4.0.0
37-
pytest-mock==3.10.0
33+
packaging==23.2
34+
pluggy==1.3.0
35+
pytest==7.4.3
36+
pytest-asyncio==0.21.1
37+
pytest-cov==4.1.0
38+
pytest-mock==3.12.0
3839
requests==2.28.1
3940
sortedcontainers==2.4.0
4041
tomli==2.0.1
41-
urllib3==1.26.15
42+
typing-extensions==4.8.0
43+
urllib3==1.26.18
4244
werkzeug==2.1.2
43-
wrapt==1.15.0
44-
zipp==3.15.0
45-
zope-event==4.6
46-
zope-interface==5.5.2
45+
wrapt==1.16.0
46+
zipp==3.17.0
47+
zope-event==5.0
48+
zope-interface==6.1
4749

4850
# The following packages are considered to be unsafe in a requirements file:
4951
# setuptools

.riot/requirements/11537f3.txt

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

.riot/requirements/16dbf14.txt renamed to .riot/requirements/11e0b62.txt

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,50 @@
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/16dbf14.in
5+
# pip-compile --no-annotate .riot/requirements/11e0b62.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
cattrs==23.1.2
9+
certifi==2023.7.22
910
charset-normalizer==2.1.1
10-
click==8.1.3
11-
coverage[toml]==7.2.2
12-
deprecated==1.2.13
13-
exceptiongroup==1.1.1
11+
click==8.1.7
12+
coverage[toml]==7.3.2
13+
deprecated==1.2.14
14+
exceptiongroup==1.1.3
1415
flask==2.1.3
15-
gevent==22.10.2
16-
greenlet==2.0.2
16+
gevent==23.9.1
17+
greenlet==3.0.1
1718
hypothesis==6.45.0
1819
idna==3.4
19-
importlib-metadata==6.0.0
20+
importlib-metadata==6.8.0
2021
iniconfig==2.0.0
2122
itsdangerous==2.1.2
2223
jinja2==3.1.2
2324
markupsafe==2.0.1
24-
mock==5.0.1
25+
mock==5.1.0
2526
opentelemetry-api==1.11.1
2627
opentelemetry-instrumentation==0.32b0
2728
opentelemetry-instrumentation-flask==0.32b0
2829
opentelemetry-instrumentation-wsgi==0.32b0
2930
opentelemetry-semantic-conventions==0.32b0
3031
opentelemetry-util-http==0.32b0
3132
opentracing==2.4.0
32-
packaging==23.0
33-
pluggy==1.0.0
34-
pytest==7.2.2
35-
pytest-asyncio==0.20.3
36-
pytest-cov==4.0.0
37-
pytest-mock==3.10.0
33+
packaging==23.2
34+
pluggy==1.3.0
35+
pytest==7.4.3
36+
pytest-asyncio==0.21.1
37+
pytest-cov==4.1.0
38+
pytest-mock==3.12.0
3839
requests==2.28.1
3940
sortedcontainers==2.4.0
4041
tomli==2.0.1
41-
urllib3==1.26.15
42+
typing-extensions==4.8.0
43+
urllib3==1.26.18
4244
werkzeug==2.1.2
43-
wrapt==1.15.0
44-
zipp==3.15.0
45-
zope-event==4.6
46-
zope-interface==5.5.2
45+
wrapt==1.16.0
46+
zipp==3.17.0
47+
zope-event==5.0
48+
zope-interface==6.1
4749

4850
# The following packages are considered to be unsafe in a requirements file:
4951
# setuptools

.riot/requirements/11e4df2.txt

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.7
3+
# by the following command:
4+
#
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/11e4df2.in
6+
#
7+
attrs==23.1.0
8+
cattrs==23.1.2
9+
certifi==2023.7.22
10+
charset-normalizer==2.1.1
11+
click==8.1.7
12+
coverage[toml]==7.2.7
13+
deprecated==1.2.14
14+
exceptiongroup==1.1.3
15+
flask==2.1.3
16+
gevent==22.10.2
17+
greenlet==3.0.1
18+
hypothesis==6.45.0
19+
idna==3.4
20+
importlib-metadata==6.7.0
21+
iniconfig==2.0.0
22+
itsdangerous==2.1.2
23+
jinja2==3.1.2
24+
markupsafe==2.0.1
25+
mock==5.1.0
26+
opentelemetry-api==1.21.0
27+
opentelemetry-instrumentation==0.42b0
28+
opentelemetry-instrumentation-flask==0.42b0
29+
opentelemetry-instrumentation-wsgi==0.42b0
30+
opentelemetry-semantic-conventions==0.42b0
31+
opentelemetry-util-http==0.42b0
32+
opentracing==2.4.0
33+
packaging==23.2
34+
pluggy==1.2.0
35+
pytest==7.4.3
36+
pytest-asyncio==0.21.1
37+
pytest-cov==4.1.0
38+
pytest-mock==3.11.1
39+
requests==2.28.1
40+
sortedcontainers==2.4.0
41+
tomli==2.0.1
42+
typing-extensions==4.7.1
43+
urllib3==1.26.18
44+
werkzeug==2.1.2
45+
wrapt==1.16.0
46+
zipp==3.15.0
47+
zope-event==5.0
48+
zope-interface==6.1
49+
50+
# The following packages are considered to be unsafe in a requirements file:
51+
# setuptools

.riot/requirements/14d3505.txt renamed to .riot/requirements/12d1dd7.txt

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,50 @@
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/14d3505.in
5+
# pip-compile --no-annotate .riot/requirements/12d1dd7.in
66
#
7-
attrs==22.2.0
8-
certifi==2022.12.7
7+
attrs==23.1.0
8+
cattrs==23.1.2
9+
certifi==2023.7.22
910
charset-normalizer==2.1.1
10-
click==8.1.3
11-
coverage[toml]==7.2.2
12-
deprecated==1.2.13
13-
exceptiongroup==1.1.1
11+
click==8.1.7
12+
coverage[toml]==7.3.2
13+
deprecated==1.2.14
14+
exceptiongroup==1.1.3
1415
flask==2.1.3
15-
gevent==22.10.2
16-
greenlet==2.0.2
16+
gevent==23.9.1
17+
greenlet==3.0.1
1718
hypothesis==6.45.0
1819
idna==3.4
19-
importlib-metadata==6.0.0
20+
importlib-metadata==6.8.0
2021
iniconfig==2.0.0
2122
itsdangerous==2.1.2
2223
jinja2==3.1.2
2324
markupsafe==2.0.1
24-
mock==5.0.1
25+
mock==5.1.0
2526
opentelemetry-api==1.8.0
2627
opentelemetry-instrumentation==0.32b0
2728
opentelemetry-instrumentation-flask==0.32b0
2829
opentelemetry-instrumentation-wsgi==0.32b0
2930
opentelemetry-semantic-conventions==0.32b0
3031
opentelemetry-util-http==0.32b0
3132
opentracing==2.4.0
32-
packaging==23.0
33-
pluggy==1.0.0
34-
pytest==7.2.2
35-
pytest-asyncio==0.20.3
36-
pytest-cov==4.0.0
37-
pytest-mock==3.10.0
33+
packaging==23.2
34+
pluggy==1.3.0
35+
pytest==7.4.3
36+
pytest-asyncio==0.21.1
37+
pytest-cov==4.1.0
38+
pytest-mock==3.12.0
3839
requests==2.28.1
3940
sortedcontainers==2.4.0
4041
tomli==2.0.1
41-
urllib3==1.26.15
42+
typing-extensions==4.8.0
43+
urllib3==1.26.18
4244
werkzeug==2.1.2
43-
wrapt==1.15.0
44-
zipp==3.15.0
45-
zope-event==4.6
46-
zope-interface==5.5.2
45+
wrapt==1.16.0
46+
zipp==3.17.0
47+
zope-event==5.0
48+
zope-interface==6.1
4749

4850
# The following packages are considered to be unsafe in a requirements file:
4951
# setuptools

.riot/requirements/132b64a.txt

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

0 commit comments

Comments
 (0)