Move pyramid test cases to riot (#2947) (#2955)

Moved the pyramid test cases from tox.ini to riot because riot is the future.

(cherry picked from commit 24dd998)

Co-authored-by: Zachary Groves <[email protected]>

Author: mergify[bot]

.circleci/config.yml

@@ -724,8 +724,8 @@ jobs:
   pyramid:
     <<: *contrib_job
     steps:
-      - run_tox_scenario:
-          pattern: '^pyramid_contrib\(_autopatch\)\?-'
+      - run_test:
+          pattern: 'pyramid'
 
   requests:
     <<: *contrib_job

riotfile.py

@@ -936,6 +936,34 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                 ),
             ],
         ),
+        Venv(
+            name="pyramid",
+            venvs=[
+                Venv(
+                    pys=select_pys(),
+                    pkgs={
+                        "webtest": [latest],
+                        "pyramid": [
+                            "~=1.7",
+                            "~=1.8",
+                            "~=1.9",
+                            "~=1.10",
+                            latest,
+                        ],
+                    },
+                    venvs=[
+                        Venv(command="pytest {cmdargs} tests/contrib/pyramid/test_pyramid.py"),
+                        Venv(
+                            command=(
+                                "python tests/ddtrace_run.py pytest {cmdargs}"
+                                " tests/contrib/pyramid/test_pyramid_autopatch.py"
+                            ),
+                            env={"DATADOG_SERVICE_NAME": "foobar", "DATADOG_PYRAMID_DISTRIBUTED_TRACING": "True"},
+                        ),
+                    ],
+                ),
+            ],
+        ),
         Venv(
             # aiobotocore: aiobotocore>=1.0 not yet supported
             name="aiobotocore",

tox.ini

@@ -59,9 +59,7 @@ envlist =
     pymysql_contrib-py{27,35,36,37,38,39,310}-pymysql{07,08,09,}
     pynamodb_contrib-py{27,35,36,37,38,39,310}-pynamodb{40,41,42,43,}-moto1
     pyodbc_contrib-py{27,35,36,37,38,39}-pyodbc{3,4}
-    pyramid_contrib{,_autopatch}-py{27,35,36,37,38,39,310}-pyramid{17,18,19,110,}-webtest
     requests_contrib{,_autopatch}-py{27,35,36,37,38,39,310}-requests{208,209,210,211,212,213,219}
-    pyramid_contrib{,_autopatch}-py{27,35,36,37,38,39,310}-pyramid{17,18,19,110,}-webtest
     sanic_contrib-py{37,38,39}-sanic{1906,1909,1912,2003,2006,2103}
     sanic_contrib-py{310}-sanic{2103}
     sqlite3_contrib-py{27,35,36,37,38,39,310}-sqlite3
@@ -94,8 +92,6 @@ setenv =
     integration-latest: AGENT_VERSION=latest
     integration-snapshot: AGENT_VERSION=testagent
     bottle_contrib_autopatch: DATADOG_SERVICE_NAME=bottle-app
-    pyramid_contrib_autopatch: DATADOG_SERVICE_NAME=foobar
-    pyramid_contrib_autopatch: DATADOG_PYRAMID_DISTRIBUTED_TRACING=True
 
 extras =
   profile: profiling
@@ -212,11 +208,6 @@ deps =
     pymysql07: pymysql>=0.7,<0.8
     pymysql08: pymysql>=0.8,<0.9
     pymysql09: pymysql>=0.9,<0.10
-    pyramid: pyramid
-    pyramid17: pyramid>=1.7,<1.8
-    pyramid18: pyramid>=1.8,<1.9
-    pyramid19: pyramid>=1.9,<1.10
-    pyramid110: pyramid>=1.10,<1.11
     pyodbc: pyodbc
     pyodbc4: pyodbc>=4.0,<5.0
     pyodbc3: pyodbc>=3.0,<4.0
@@ -306,8 +297,6 @@ commands =
     pylons_contrib: python -m pytest {posargs} tests/contrib/pylons
     pymysql_contrib: pytest {posargs} tests/contrib/pymysql
     pyodbc_contrib: pytest {posargs} tests/contrib/pyodbc
-    pyramid_contrib: pytest {posargs} tests/contrib/pyramid/test_pyramid.py
-    pyramid_contrib_autopatch: python tests/ddtrace_run.py pytest {posargs} tests/contrib/pyramid/test_pyramid_autopatch.py
     kombu_contrib: pytest {posargs} tests/contrib/kombu
     sanic_contrib: pytest {posargs} tests/contrib/sanic/test_sanic.py
     sanic_contrib: pytest {posargs} tests/contrib/sanic/test_sanic_server.py