ci: upgrade riot to fix dev packages (#5972)

Follow up to: #5949

We will need to merge this PR before typing_extensions v4.6.3 is
released
([link](python/typing_extensions#196 (comment)))
or ci will be break again.

- [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/)).

- [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.

---------

Co-authored-by: Gabriele N. Tornetta <[email protected]>
Co-authored-by: Gabriele N. Tornetta <[email protected]>
Co-authored-by: Brett Langdon <[email protected]>
(cherry picked from commit c0174f8)

Author: 3 people

.circleci/config.yml

@@ -72,7 +72,11 @@ commands:
     description: "Install riot"
     steps:
       # Make sure we install and run riot on Python 3
+<<<<<<< HEAD
       - run: pip3 install riot==0.17.2
+=======
+      - run: pip3 install riot==0.17.4
+>>>>>>> c0174f873 (ci: upgrade riot to fix dev packages (#5972))
 
   save_pip_cache:
     description: "Save pip cache directory"

.riot/requirements/b4b9321.txt renamed to .riot/requirements/1b6378d.txt

@@ -2,31 +2,31 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/b4b9321.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/1b6378d.in
 #
-attrs==22.2.0
-click==8.1.3
-coverage[toml]==7.2.2
+attrs==23.1.0
+click==8.1.4
+coverage[toml]==7.2.7
 distlib==0.3.6
-exceptiongroup==1.1.1
-filelock==3.10.0
+exceptiongroup==1.1.2
+filelock==3.12.2
 hypothesis==6.45.0
 iniconfig==2.0.0
-markdown-it-py==2.2.0
+markdown-it-py==3.0.0
 mdurl==0.1.2
-mock==5.0.1
+mock==5.1.0
 opentracing==2.4.0
-packaging==23.0
+packaging==23.1
 pexpect==4.8.0
-platformdirs==3.1.1
-pluggy==1.0.0
+platformdirs==3.8.1
+pluggy==1.2.0
 ptyprocess==0.7.0
-pygments==2.14.0
-pytest==7.2.2
-pytest-cov==4.0.0
-pytest-mock==3.10.0
-rich==13.3.2
-riot==0.17.0
+pygments==2.15.1
+pytest==7.4.0
+pytest-cov==4.1.0
+pytest-mock==3.11.1
+rich==13.4.2
+riot==0.17.4
 sortedcontainers==2.4.0
 tomli==2.0.1
-virtualenv==20.21.0
+virtualenv==20.20.0

riotfile.py

@@ -147,6 +147,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
             name="mypy",
             command="mypy {cmdargs}",
             create=True,
+            skip_dev_install=True,
             pkgs={
                 "mypy": "==0.991",
                 "envier": "==0.4.0",
@@ -197,7 +198,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
             name="riot-helpers",
             # DEV: pytest really doesn't want to execute only `riotfile.py`, call doctest directly
             command="python -m doctest {cmdargs} riotfile.py",
-            pkgs={"riot": latest},
+            pkgs={"riot": "==0.17.4"},
         ),
         Venv(
             pys=["3"],
@@ -2768,6 +2769,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                                         "tenacity": "==5.0.1",
                                         "protobuf": "==3.8.0",
                                     },
+                                    create=True,  # Needed bp Python 3.5 because of namespace packages
                                 ),
                                 # Gevent
                                 Venv(

scripts/ddtest

@@ -12,7 +12,8 @@ fi
 # retry docker pull if fails
 for i in {1..3}; do docker-compose pull -q testrunner && break || sleep 3; done
 
-FULL_CMD="pip install -q --disable-pip-version-check riot==0.17.2 && $CMD"
+FULL_CMD="pip install -q --disable-pip-version-check riot==0.17.4 && $CMD"
+
 
 # install and upgrade riot in case testrunner image has not been updated
 # DEV: Use `--no-TTY` and `--quiet-pull` when running in CircleCI

tests/debugging/exploration/test_bootstrap.py

@@ -1,3 +1,4 @@
+import os
 from os.path import dirname
 
 import pytest
@@ -45,7 +46,10 @@
 """
 
 
-@pytest.mark.subprocess(env={"PYTHONPATH": dirname(__file__) + ":."}, out=OUT)
+@pytest.mark.subprocess(
+    env={"PYTHONPATH": os.pathsep.join((dirname(__file__), os.getenv("PYTHONPATH", "")))},
+    out=OUT,
+)
 def test_exploration_bootstrap():
     # We test that we get the expected output from the exploration debuggers
     # and no errors when running the sitecustomize.py script.

tests/debugging/test_debugger.py

@@ -853,7 +853,7 @@ def test_debugger_run_module():
     # This is also where the sitecustomize resides, so we set the PYTHONPATH
     # accordingly. This is responsible for booting the test debugger
     env = os.environ.copy()
-    env["PYTHONPATH"] = cwd
+    env["PYTHONPATH"] = os.pathsep.join((cwd, env.get("PYTHONPATH", "")))
 
     out, err, status, _ = call_program(sys.executable, "-m", "target", cwd=cwd, env=env)