Skip to content

Commit 42a0a3d

Browse files
authored
Merge branch 'main' into cbeauchesne/crash-investigation
2 parents c6946d1 + 27cd94c commit 42a0a3d

File tree

7 files changed

+99
-73
lines changed

7 files changed

+99
-73
lines changed

.riot/requirements/15235b0.txt renamed to .riot/requirements/12974a3.txt

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,38 @@
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/15235b0.in
5+
# pip-compile --no-annotate .riot/requirements/12974a3.in
66
#
77
attrs==23.2.0
8-
certifi==2023.11.17
8+
certifi==2024.7.4
99
charset-normalizer==3.3.2
1010
click==7.1.2
11-
coverage[toml]==7.4.0
12-
exceptiongroup==1.2.0
11+
coverage[toml]==7.6.0
12+
deprecated==1.2.14
13+
exceptiongroup==1.2.2
1314
flask==1.1.4
14-
gunicorn==21.2.0
15+
gunicorn==22.0.0
1516
httpretty==1.0.5
1617
hypothesis==6.45.0
17-
idna==3.6
18-
importlib-metadata==7.0.1
18+
idna==3.7
19+
importlib-metadata==7.0.0
1920
iniconfig==2.0.0
2021
itsdangerous==1.1.0
2122
jinja2==2.11.3
2223
markupsafe==1.1.1
2324
mock==5.1.0
25+
opentelemetry-api==1.24.0
2426
opentracing==2.4.0
25-
packaging==23.2
26-
pluggy==1.3.0
27-
pytest==7.4.4
28-
pytest-cov==4.1.0
29-
pytest-mock==3.12.0
27+
packaging==24.1
28+
pluggy==1.5.0
29+
pytest==8.3.2
30+
pytest-cov==5.0.0
31+
pytest-mock==3.14.0
3032
pytest-randomly==3.15.0
31-
requests==2.31.0
33+
requests==2.32.3
3234
sortedcontainers==2.4.0
3335
tomli==2.0.1
34-
urllib3==2.1.0
36+
urllib3==2.2.2
3537
werkzeug==1.0.1
36-
zipp==3.17.0
38+
wrapt==1.16.0
39+
zipp==3.19.2

.riot/requirements/1153ad9.txt renamed to .riot/requirements/1677649.txt

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,36 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1153ad9.in
5+
# pip-compile --no-annotate .riot/requirements/1677649.in
66
#
77
attrs==23.2.0
8-
certifi==2023.11.17
8+
certifi==2024.7.4
99
charset-normalizer==3.3.2
1010
click==7.1.2
11-
coverage[toml]==7.4.0
11+
coverage[toml]==7.6.0
12+
deprecated==1.2.14
1213
flask==1.1.4
13-
gunicorn==21.2.0
14+
gunicorn==22.0.0
1415
httpretty==1.0.5
1516
hypothesis==6.45.0
16-
idna==3.6
17+
idna==3.7
18+
importlib-metadata==7.0.0
1719
iniconfig==2.0.0
1820
itsdangerous==1.1.0
1921
jinja2==2.11.3
2022
markupsafe==1.1.1
2123
mock==5.1.0
24+
opentelemetry-api==1.24.0
2225
opentracing==2.4.0
23-
packaging==23.2
24-
pluggy==1.3.0
25-
pytest==7.4.4
26-
pytest-cov==4.1.0
27-
pytest-mock==3.12.0
26+
packaging==24.1
27+
pluggy==1.5.0
28+
pytest==8.3.2
29+
pytest-cov==5.0.0
30+
pytest-mock==3.14.0
2831
pytest-randomly==3.15.0
29-
requests==2.31.0
32+
requests==2.32.3
3033
sortedcontainers==2.4.0
31-
urllib3==2.1.0
34+
urllib3==2.2.2
3235
werkzeug==1.0.1
36+
wrapt==1.16.0
37+
zipp==3.19.2

.riot/requirements/427c22a.txt renamed to .riot/requirements/17c4377.txt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/427c22a.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/17c4377.in
66
#
77
attrs==23.2.0
8-
certifi==2023.11.17
8+
certifi==2024.7.4
99
charset-normalizer==3.3.2
1010
click==7.1.2
1111
coverage[toml]==7.2.7
12-
exceptiongroup==1.2.0
12+
deprecated==1.2.14
13+
exceptiongroup==1.2.2
1314
flask==1.1.4
14-
gunicorn==21.2.0
15+
gunicorn==22.0.0
1516
httpretty==1.0.5
1617
hypothesis==6.45.0
17-
idna==3.6
18+
idna==3.7
1819
importlib-metadata==6.7.0
1920
iniconfig==2.0.0
2021
itsdangerous==1.1.0
2122
jinja2==2.11.3
2223
markupsafe==1.1.1
2324
mock==5.1.0
25+
opentelemetry-api==1.22.0
2426
opentracing==2.4.0
25-
packaging==23.2
27+
packaging==24.0
2628
pluggy==1.2.0
2729
pytest==7.4.4
2830
pytest-cov==4.1.0
@@ -34,4 +36,5 @@ tomli==2.0.1
3436
typing-extensions==4.7.1
3537
urllib3==2.0.7
3638
werkzeug==1.0.1
39+
wrapt==1.16.0
3740
zipp==3.15.0

.riot/requirements/135aac0.txt renamed to .riot/requirements/18589ec.txt

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,38 @@
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/135aac0.in
5+
# pip-compile --no-annotate .riot/requirements/18589ec.in
66
#
77
attrs==23.2.0
8-
certifi==2023.11.17
8+
certifi==2024.7.4
99
charset-normalizer==3.3.2
1010
click==7.1.2
11-
coverage[toml]==7.4.0
12-
exceptiongroup==1.2.0
11+
coverage[toml]==7.6.0
12+
deprecated==1.2.14
13+
exceptiongroup==1.2.2
1314
flask==1.1.4
14-
gunicorn==21.2.0
15+
gunicorn==22.0.0
1516
httpretty==1.0.5
1617
hypothesis==6.45.0
17-
idna==3.6
18-
importlib-metadata==7.0.1
18+
idna==3.7
19+
importlib-metadata==7.0.0
1920
iniconfig==2.0.0
2021
itsdangerous==1.1.0
2122
jinja2==2.11.3
2223
markupsafe==1.1.1
2324
mock==5.1.0
25+
opentelemetry-api==1.24.0
2426
opentracing==2.4.0
25-
packaging==23.2
26-
pluggy==1.3.0
27-
pytest==7.4.4
28-
pytest-cov==4.1.0
29-
pytest-mock==3.12.0
27+
packaging==24.1
28+
pluggy==1.5.0
29+
pytest==8.3.2
30+
pytest-cov==5.0.0
31+
pytest-mock==3.14.0
3032
pytest-randomly==3.15.0
31-
requests==2.31.0
33+
requests==2.32.3
3234
sortedcontainers==2.4.0
3335
tomli==2.0.1
34-
urllib3==2.1.0
36+
urllib3==2.2.2
3537
werkzeug==1.0.1
36-
zipp==3.17.0
38+
wrapt==1.16.0
39+
zipp==3.19.2

.riot/requirements/118cb50.txt renamed to .riot/requirements/1a14242.txt

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,38 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/118cb50.in
5+
# pip-compile --no-annotate .riot/requirements/1a14242.in
66
#
77
attrs==23.2.0
8-
certifi==2023.11.17
8+
certifi==2024.7.4
99
charset-normalizer==3.3.2
1010
click==7.1.2
11-
coverage[toml]==7.4.0
12-
exceptiongroup==1.2.0
11+
coverage[toml]==7.6.0
12+
deprecated==1.2.14
13+
exceptiongroup==1.2.2
1314
flask==1.1.4
14-
gunicorn==21.2.0
15+
gunicorn==22.0.0
1516
httpretty==1.0.5
1617
hypothesis==6.45.0
17-
idna==3.6
18+
idna==3.7
19+
importlib-metadata==7.0.0
1820
iniconfig==2.0.0
1921
itsdangerous==1.1.0
2022
jinja2==2.11.3
2123
markupsafe==1.1.1
2224
mock==5.1.0
25+
opentelemetry-api==1.24.0
2326
opentracing==2.4.0
24-
packaging==23.2
25-
pluggy==1.3.0
26-
pytest==7.4.4
27-
pytest-cov==4.1.0
28-
pytest-mock==3.12.0
27+
packaging==24.1
28+
pluggy==1.5.0
29+
pytest==8.3.2
30+
pytest-cov==5.0.0
31+
pytest-mock==3.14.0
2932
pytest-randomly==3.15.0
30-
requests==2.31.0
33+
requests==2.32.3
3134
sortedcontainers==2.4.0
3235
tomli==2.0.1
33-
urllib3==2.1.0
36+
urllib3==2.2.2
3437
werkzeug==1.0.1
38+
wrapt==1.16.0
39+
zipp==3.19.2

.riot/requirements/17a929f.txt renamed to .riot/requirements/5c0475c.txt

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,36 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/17a929f.in
5+
# pip-compile --no-annotate .riot/requirements/5c0475c.in
66
#
77
attrs==23.2.0
8-
certifi==2023.11.17
8+
certifi==2024.7.4
99
charset-normalizer==3.3.2
1010
click==7.1.2
11-
coverage[toml]==7.4.0
11+
coverage[toml]==7.6.0
12+
deprecated==1.2.14
1213
flask==1.1.4
13-
gunicorn==21.2.0
14+
gunicorn==22.0.0
1415
httpretty==1.0.5
1516
hypothesis==6.45.0
16-
idna==3.6
17+
idna==3.7
18+
importlib-metadata==7.0.0
1719
iniconfig==2.0.0
1820
itsdangerous==1.1.0
1921
jinja2==2.11.3
2022
markupsafe==1.1.1
2123
mock==5.1.0
24+
opentelemetry-api==1.24.0
2225
opentracing==2.4.0
23-
packaging==23.2
24-
pluggy==1.3.0
25-
pytest==7.4.4
26-
pytest-cov==4.1.0
27-
pytest-mock==3.12.0
26+
packaging==24.1
27+
pluggy==1.5.0
28+
pytest==8.3.2
29+
pytest-cov==5.0.0
30+
pytest-mock==3.14.0
2831
pytest-randomly==3.15.0
29-
requests==2.31.0
32+
requests==2.32.3
3033
sortedcontainers==2.4.0
31-
urllib3==2.1.0
34+
urllib3==2.2.2
3235
werkzeug==1.0.1
36+
wrapt==1.16.0
37+
zipp==3.19.2

riotfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
330330
"flask": "<=2.2.3",
331331
"httpretty": "<1.1",
332332
"werkzeug": "<2.0",
333+
# FIXME: ddtrace does not support the latest versions of opentelemetry-api
334+
"opentelemetry-api": "<1.25.0",
333335
"pytest-randomly": latest,
334336
"markupsafe": "<2.0",
335337
},

0 commit comments

Comments
 (0)