Skip to content

Commit eff5773

Browse files
authored
chore(ci): move slotscheck and conftest CI steps to riot (#13591)
Let's get back those sweet 5*2 minutes for "configuring project in dev mode" multiplied by many PRs and retries. ## Checklist - [X] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --------- Signed-off-by: Juanjo Alvarez <[email protected]>
1 parent 4c7f8b2 commit eff5773

File tree

8 files changed

+61
-53
lines changed

8 files changed

+61
-53
lines changed

.riot/requirements/16ebde6.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/16ebde6.in
6+
#
7+
attrs==25.3.0
8+
click==8.2.1
9+
coverage[toml]==7.8.2
10+
exceptiongroup==1.3.0
11+
hypothesis==6.45.0
12+
iniconfig==2.1.0
13+
mock==5.2.0
14+
opentracing==2.4.0
15+
packaging==25.0
16+
pluggy==1.6.0
17+
pygments==2.19.1
18+
pytest==8.4.0
19+
pytest-cov==6.1.1
20+
pytest-mock==3.14.1
21+
slotscheck==0.17.0
22+
sortedcontainers==2.4.0
23+
tomli==2.2.1
24+
typing-extensions==4.14.0

.riot/requirements/1bc972c.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate .riot/requirements/1bc972c.in
6+
#
7+
attrs==25.3.0
8+
coverage[toml]==7.8.2
9+
exceptiongroup==1.3.0
10+
hypothesis==6.45.0
11+
iniconfig==2.1.0
12+
mock==5.2.0
13+
opentracing==2.4.0
14+
packaging==25.0
15+
pluggy==1.6.0
16+
pygments==2.19.1
17+
pytest==8.4.0
18+
pytest-cov==6.1.1
19+
pytest-mock==3.14.1
20+
sortedcontainers==2.4.0
21+
tomli==2.2.1
22+
typing-extensions==4.14.0

.riot/requirements/1c84c16.txt

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

hatch.toml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,6 @@ build = [
116116
"scripts/docs/build.sh",
117117
]
118118

119-
[envs.slotscheck]
120-
template = "slotscheck"
121-
python = "3.10"
122-
features = ["opentracing"]
123-
extra-dependencies = [
124-
"slotscheck==0.17.0",
125-
]
126-
127-
[envs.slotscheck.scripts]
128-
test = [
129-
"python -m slotscheck -v ddtrace/",
130-
]
131-
132-
133119
[envs.scripts]
134120
detached = true
135121
python = "3.10"
@@ -148,21 +134,6 @@ needs_testrun = [
148134
"scripts/needs_testrun.py {args}",
149135
]
150136

151-
[envs.meta-testing]
152-
python = "3.10"
153-
extra-dependencies = [
154-
"pytest",
155-
"pytest-cov",
156-
"hypothesis<6.45.1"
157-
]
158-
[envs.meta-testing.env-vars]
159-
DD_CIVISIBILITY_FLAKY_RETRY_ENABLED = "0"
160-
161-
[envs.meta-testing.scripts]
162-
test = [
163-
"pytest {args} --no-ddtrace tests/meta"
164-
]
165-
166137
[envs.integration_test]
167138
template = "integration_test"
168139
extra-dependencies = [

lib-injection/sources/min_compatible_versions.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ rq,~=1.8.0
169169
ruamel.yaml,0
170170
sanic,~=20.12
171171
sanic-testing,~=0.8.3
172+
slotscheck,==0.17.0
172173
snowflake-connector-python,~=2.3.0
173174
spyne,0
174175
sqlalchemy,~=1.2.18

min_compatible_versions.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ rq,~=1.8.0
169169
ruamel.yaml,0
170170
sanic,~=20.12
171171
sanic-testing,~=0.8.3
172+
slotscheck,==0.17.0
172173
snowflake-connector-python,~=2.3.0
173174
spyne,0
174175
sqlalchemy,~=1.2.18

riotfile.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,18 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
102102
},
103103
venvs=[
104104
Venv(
105-
pys=["3"],
106105
name="meta-testing",
107-
command="pytest {cmdargs} tests/meta",
106+
pys=["3.10"],
107+
command="pytest {cmdargs} --no-ddtrace tests/meta",
108+
env={
109+
"DD_CIVISIBILITY_FLAKY_RETRY_ENABLED": "0",
110+
},
111+
),
112+
Venv(
113+
name="slotscheck",
114+
command="python -m slotscheck -v ddtrace/",
115+
pys=["3.10"],
116+
pkgs={"slotscheck": "==0.17.0"},
108117
),
109118
Venv(
110119
name="gitlab-gen-config",

tests/suitespec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ suites:
149149
- 'conftest.py'
150150
- '**/conftest.py'
151151
pattern: meta-testing
152-
runner: hatch
152+
runner: riot
153153
snapshot: false
154154
ddtracerun:
155155
parallelism: 3
@@ -208,7 +208,7 @@ suites:
208208
parallelism: 1
209209
paths:
210210
- 'ddtrace/**/*.py'
211-
runner: hatch
211+
runner: riot
212212
snapshot: false
213213
profile:
214214
env:

0 commit comments

Comments
 (0)