Skip to content

Commit 15b4185

Browse files
authored
Merge branch '2.19' into backport-11460-to-2.19
2 parents 4a7b603 + 8fc7d4e commit 15b4185

File tree

4 files changed

+40
-34
lines changed

4 files changed

+40
-34
lines changed

.riot/requirements/1d4e95e.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.13
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1d4e95e.in
6+
#
7+
attrs==24.3.0
8+
coverage[toml]==7.6.10
9+
gevent==24.11.1
10+
greenlet==3.1.1
11+
hypothesis==6.45.0
12+
iniconfig==2.0.0
13+
mock==5.1.0
14+
msgpack==1.1.0
15+
opentracing==2.4.0
16+
packaging==24.2
17+
pluggy==1.5.0
18+
pytest==8.3.4
19+
pytest-cov==6.0.0
20+
pytest-mock==3.14.0
21+
pytest-randomly==3.16.0
22+
sortedcontainers==2.4.0
23+
zope-event==5.0
24+
zope-interface==7.2
25+
26+
# The following packages are considered to be unsafe in a requirements file:
27+
setuptools==75.8.0

.riot/requirements/2d19e52.txt

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

.riot/requirements/27d0ff3.txt renamed to .riot/requirements/6bec1ec.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/27d0ff3.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/6bec1ec.in
66
#
77
attrs==24.3.0
88
coverage[toml]==7.6.1
99
exceptiongroup==1.2.2
1010
gevent==24.2.1
11-
greenlet==3.1.1
11+
greenlet==3.1.0
1212
hypothesis==6.45.0
1313
importlib-metadata==8.5.0
1414
iniconfig==2.0.0

riotfile.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2871,6 +2871,17 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
28712871
env={
28722872
"DD_AGENT_PORT": "9126",
28732873
},
2874+
venvs=[
2875+
# Python 3.8
2876+
Venv(
2877+
pys=["3.8"],
2878+
pkgs={"greenlet": "==3.1.0"},
2879+
),
2880+
# Python 3.9+
2881+
Venv(
2882+
pys=select_pys(min_version="3.9"),
2883+
),
2884+
],
28742885
),
28752886
Venv(
28762887
name="subprocess",

0 commit comments

Comments
 (0)