Merge branch '2.8' into backport-9989-to-2.8

.riot/requirements/15235b0.txt → .riot/requirements/12974a3.txt

@@ -2,35 +2,38 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/15235b0.in
+#    pip-compile --no-annotate .riot/requirements/12974a3.in
 #
 attrs==23.2.0
-certifi==2023.11.17
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==7.1.2
-coverage[toml]==7.4.0
-exceptiongroup==1.2.0
+coverage[toml]==7.6.0
+deprecated==1.2.14
+exceptiongroup==1.2.2
 flask==1.1.4
-gunicorn==21.2.0
+gunicorn==22.0.0
 httpretty==1.0.5
 hypothesis==6.45.0
-idna==3.6
-importlib-metadata==7.0.1
+idna==3.7
+importlib-metadata==7.0.0
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
+opentelemetry-api==1.24.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.2
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sortedcontainers==2.4.0
 tomli==2.0.1
-urllib3==2.1.0
+urllib3==2.2.2
 werkzeug==1.0.1
-zipp==3.17.0
+wrapt==1.16.0
+zipp==3.19.2

.riot/requirements/1153ad9.txt → .riot/requirements/1677649.txt

@@ -2,31 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/1153ad9.in
+#    pip-compile --no-annotate .riot/requirements/1677649.in
 #
 attrs==23.2.0
-certifi==2023.11.17
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==7.1.2
-coverage[toml]==7.4.0
+coverage[toml]==7.6.0
+deprecated==1.2.14
 flask==1.1.4
-gunicorn==21.2.0
+gunicorn==22.0.0
 httpretty==1.0.5
 hypothesis==6.45.0
-idna==3.6
+idna==3.7
+importlib-metadata==7.0.0
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
+opentelemetry-api==1.24.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.2
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sortedcontainers==2.4.0
-urllib3==2.1.0
+urllib3==2.2.2
 werkzeug==1.0.1
+wrapt==1.16.0
+zipp==3.19.2

.riot/requirements/427c22a.txt → .riot/requirements/17c4377.txt

@@ -2,27 +2,29 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/427c22a.in
+#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/17c4377.in
 #
 attrs==23.2.0
-certifi==2023.11.17
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==7.1.2
 coverage[toml]==7.2.7
-exceptiongroup==1.2.0
+deprecated==1.2.14
+exceptiongroup==1.2.2
 flask==1.1.4
-gunicorn==21.2.0
+gunicorn==22.0.0
 httpretty==1.0.5
 hypothesis==6.45.0
-idna==3.6
+idna==3.7
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
+opentelemetry-api==1.22.0
 opentracing==2.4.0
-packaging==23.2
+packaging==24.0
 pluggy==1.2.0
 pytest==7.4.4
 pytest-cov==4.1.0
@@ -34,4 +36,5 @@ tomli==2.0.1
 typing-extensions==4.7.1
 urllib3==2.0.7
 werkzeug==1.0.1
+wrapt==1.16.0
 zipp==3.15.0

.riot/requirements/135aac0.txt → .riot/requirements/18589ec.txt

@@ -2,35 +2,38 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/135aac0.in
+#    pip-compile --no-annotate .riot/requirements/18589ec.in
 #
 attrs==23.2.0
-certifi==2023.11.17
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==7.1.2
-coverage[toml]==7.4.0
-exceptiongroup==1.2.0
+coverage[toml]==7.6.0
+deprecated==1.2.14
+exceptiongroup==1.2.2
 flask==1.1.4
-gunicorn==21.2.0
+gunicorn==22.0.0
 httpretty==1.0.5
 hypothesis==6.45.0
-idna==3.6
-importlib-metadata==7.0.1
+idna==3.7
+importlib-metadata==7.0.0
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
+opentelemetry-api==1.24.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.2
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sortedcontainers==2.4.0
 tomli==2.0.1
-urllib3==2.1.0
+urllib3==2.2.2
 werkzeug==1.0.1
-zipp==3.17.0
+wrapt==1.16.0
+zipp==3.19.2

.riot/requirements/118cb50.txt → .riot/requirements/1a14242.txt

@@ -2,33 +2,38 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/118cb50.in
+#    pip-compile --no-annotate .riot/requirements/1a14242.in
 #
 attrs==23.2.0
-certifi==2023.11.17
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==7.1.2
-coverage[toml]==7.4.0
-exceptiongroup==1.2.0
+coverage[toml]==7.6.0
+deprecated==1.2.14
+exceptiongroup==1.2.2
 flask==1.1.4
-gunicorn==21.2.0
+gunicorn==22.0.0
 httpretty==1.0.5
 hypothesis==6.45.0
-idna==3.6
+idna==3.7
+importlib-metadata==7.0.0
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
+opentelemetry-api==1.24.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.2
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sortedcontainers==2.4.0
 tomli==2.0.1
-urllib3==2.1.0
+urllib3==2.2.2
 werkzeug==1.0.1
+wrapt==1.16.0
+zipp==3.19.2

.riot/requirements/17a929f.txt → .riot/requirements/5c0475c.txt

@@ -2,31 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/17a929f.in
+#    pip-compile --no-annotate .riot/requirements/5c0475c.in
 #
 attrs==23.2.0
-certifi==2023.11.17
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==7.1.2
-coverage[toml]==7.4.0
+coverage[toml]==7.6.0
+deprecated==1.2.14
 flask==1.1.4
-gunicorn==21.2.0
+gunicorn==22.0.0
 httpretty==1.0.5
 hypothesis==6.45.0
-idna==3.6
+idna==3.7
+importlib-metadata==7.0.0
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
+opentelemetry-api==1.24.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.2
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sortedcontainers==2.4.0
-urllib3==2.1.0
+urllib3==2.2.2
 werkzeug==1.0.1
+wrapt==1.16.0
+zipp==3.19.2

riotfile.py

@@ -320,6 +320,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                 "flask": "<=2.2.3",
                 "httpretty": "<1.1",
                 "werkzeug": "<2.0",
+                # FIXME: ddtrace does not support the latest versions of opentelemetry-api
+                "opentelemetry-api": "<1.25.0",
                 "pytest-randomly": latest,
                 "markupsafe": "<2.0",
             },

tests/internal/test_packages.py

@@ -55,6 +55,10 @@ def test_get_distributions():
             importlib_pkgs.add("importlib-metadata")
         elif pkg.name == "importlib-metadata" and "importlib_metadata" in pkg_resources_ws:
             importlib_pkgs.add("importlib_metadata")
+        elif pkg.name == "importlib-resources" and "importlib_resources" in pkg_resources_ws:
+            importlib_pkgs.add("importlib_resources")
+        elif pkg.name == "importlib_resources" and "importlib-resources" in pkg_resources_ws:
+            importlib_pkgs.add("importlib-resources")
         else:
             importlib_pkgs.add(pkg.name)