Skip to content

Commit 24dd998

Browse files
authored
Move pyramid test cases to riot (#2947)
Moved the pyramid test cases from tox.ini to riot because riot is the future.
1 parent 3892b6b commit 24dd998

File tree

3 files changed

+30
-13
lines changed

3 files changed

+30
-13
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,8 @@ jobs:
724724
pyramid:
725725
<<: *contrib_job
726726
steps:
727-
- run_tox_scenario:
728-
pattern: '^pyramid_contrib\(_autopatch\)\?-'
727+
- run_test:
728+
pattern: 'pyramid'
729729

730730
requests:
731731
<<: *contrib_job

riotfile.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,34 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
936936
),
937937
],
938938
),
939+
Venv(
940+
name="pyramid",
941+
venvs=[
942+
Venv(
943+
pys=select_pys(),
944+
pkgs={
945+
"webtest": [latest],
946+
"pyramid": [
947+
"~=1.7",
948+
"~=1.8",
949+
"~=1.9",
950+
"~=1.10",
951+
latest,
952+
],
953+
},
954+
venvs=[
955+
Venv(command="pytest {cmdargs} tests/contrib/pyramid/test_pyramid.py"),
956+
Venv(
957+
command=(
958+
"python tests/ddtrace_run.py pytest {cmdargs}"
959+
" tests/contrib/pyramid/test_pyramid_autopatch.py"
960+
),
961+
env={"DATADOG_SERVICE_NAME": "foobar", "DATADOG_PYRAMID_DISTRIBUTED_TRACING": "True"},
962+
),
963+
],
964+
),
965+
],
966+
),
939967
Venv(
940968
# aiobotocore: aiobotocore>=1.0 not yet supported
941969
name="aiobotocore",

tox.ini

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ envlist =
5454
pymysql_contrib-py{27,35,36,37,38,39,310}-pymysql{07,08,09,}
5555
pynamodb_contrib-py{27,35,36,37,38,39,310}-pynamodb{40,41,42,43,}-moto1
5656
pyodbc_contrib-py{27,35,36,37,38,39}-pyodbc{3,4}
57-
pyramid_contrib{,_autopatch}-py{27,35,36,37,38,39,310}-pyramid{17,18,19,110,}-webtest
5857
requests_contrib{,_autopatch}-py{27,35,36,37,38,39,310}-requests{208,209,210,211,212,213,219}
59-
pyramid_contrib{,_autopatch}-py{27,35,36,37,38,39,310}-pyramid{17,18,19,110,}-webtest
6058
sanic_contrib-py{37,38,39}-sanic{1906,1909,1912,2003,2006,2103}
6159
sanic_contrib-py{310}-sanic{2103}
6260
sqlite3_contrib-py{27,35,36,37,38,39,310}-sqlite3
@@ -89,8 +87,6 @@ setenv =
8987
integration-latest: AGENT_VERSION=latest
9088
integration-snapshot: AGENT_VERSION=testagent
9189
bottle_contrib_autopatch: DATADOG_SERVICE_NAME=bottle-app
92-
pyramid_contrib_autopatch: DATADOG_SERVICE_NAME=foobar
93-
pyramid_contrib_autopatch: DATADOG_PYRAMID_DISTRIBUTED_TRACING=True
9490

9591
extras =
9692
profile: profiling
@@ -188,11 +184,6 @@ deps =
188184
pymysql07: pymysql>=0.7,<0.8
189185
pymysql08: pymysql>=0.8,<0.9
190186
pymysql09: pymysql>=0.9,<0.10
191-
pyramid: pyramid
192-
pyramid17: pyramid>=1.7,<1.8
193-
pyramid18: pyramid>=1.8,<1.9
194-
pyramid19: pyramid>=1.9,<1.10
195-
pyramid110: pyramid>=1.10,<1.11
196187
pyodbc: pyodbc
197188
pyodbc4: pyodbc>=4.0,<5.0
198189
pyodbc3: pyodbc>=3.0,<4.0
@@ -281,8 +272,6 @@ commands =
281272
pylons_contrib: python -m pytest {posargs} tests/contrib/pylons
282273
pymysql_contrib: pytest {posargs} tests/contrib/pymysql
283274
pyodbc_contrib: pytest {posargs} tests/contrib/pyodbc
284-
pyramid_contrib: pytest {posargs} tests/contrib/pyramid/test_pyramid.py
285-
pyramid_contrib_autopatch: python tests/ddtrace_run.py pytest {posargs} tests/contrib/pyramid/test_pyramid_autopatch.py
286275
kombu_contrib: pytest {posargs} tests/contrib/kombu
287276
sanic_contrib: pytest {posargs} tests/contrib/sanic/test_sanic.py
288277
sanic_contrib: pytest {posargs} tests/contrib/sanic/test_sanic_server.py

0 commit comments

Comments
 (0)