Skip to content

Commit 774c933

Browse files
committed
Run dedicated tox runs for asynctest, twisted<25, twisted>=25
1 parent f519098 commit 774c933

File tree

2 files changed

+52
-8
lines changed

2 files changed

+52
-8
lines changed

.github/workflows/test.yml

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
name: [
57-
"windows-py39-unittestextras",
57+
"windows-py39-asynctest",
58+
"windows-py39-twisted24",
59+
"windows-py39-twisted25",
5860
"windows-py39-pluggy",
5961
"windows-py39-xdist",
6062
"windows-py310",
@@ -63,6 +65,9 @@ jobs:
6365
"windows-py313",
6466
"windows-py314",
6567

68+
"ubuntu-py39-asynctest",
69+
"ubuntu-py39-twisted24",
70+
"ubuntu-py39-twisted25",
6671
"ubuntu-py39-lsof-numpy-pexpect",
6772
"ubuntu-py39-pluggy",
6873
"ubuntu-py39-freeze",
@@ -85,10 +90,22 @@ jobs:
8590
]
8691

8792
include:
88-
- name: "windows-py39-unittestextras"
93+
- name: "windows-py39-asynctest"
8994
python: "3.9"
9095
os: windows-latest
91-
tox_env: "py39-unittestextras"
96+
tox_env: "py39-twisted24"
97+
use_coverage: true
98+
99+
- name: "windows-py39-twisted24"
100+
python: "3.9"
101+
os: windows-latest
102+
tox_env: "py39-twisted24"
103+
use_coverage: true
104+
105+
- name: "windows-py39-twisted25"
106+
python: "3.9"
107+
os: windows-latest
108+
tox_env: "py39-twisted25"
92109
use_coverage: true
93110

94111
- name: "windows-py39-pluggy"
@@ -126,6 +143,24 @@ jobs:
126143
os: windows-latest
127144
tox_env: "py314"
128145

146+
- name: "ubuntu-py39-asynctest"
147+
python: "3.9"
148+
os: ubuntu-latest
149+
tox_env: "py39-asynctest"
150+
use_coverage: true
151+
152+
- name: "ubuntu-py39-twisted24"
153+
python: "3.9"
154+
os: ubuntu-latest
155+
tox_env: "py39-twisted24"
156+
use_coverage: true
157+
158+
- name: "ubuntu-py39-twisted25"
159+
python: "3.9"
160+
os: ubuntu-latest
161+
tox_env: "py39-twisted25"
162+
use_coverage: true
163+
129164
- name: "ubuntu-py39-lsof-numpy-pexpect"
130165
python: "3.9"
131166
os: ubuntu-latest

tox.ini

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ envlist =
1111
py313
1212
py314
1313
pypy3
14-
py39-{pexpect,xdist,unittestextras,numpy,pluggymain,pylib}
14+
py39-{pexpect,xdist,twisted24,twisted25,asynctest,numpy,pluggymain,pylib}
1515
doctesting
1616
doctesting-coverage
1717
plugins
@@ -36,7 +36,9 @@ description =
3636
pexpect: against `pexpect`
3737
pluggymain: against the bleeding edge `pluggy` from Git
3838
pylib: against `py` lib
39-
unittestextras: against the unit test extras
39+
twisted24: against the unit test extras with twisted prior to 24.0
40+
twisted25: against the unit test extras with twisted 25.0 or later
41+
asynctest: against the unit test extras with asynctest
4042
xdist: with pytest in parallel mode
4143
under `{basepython}`
4244
doctesting: including doctests
@@ -51,7 +53,7 @@ passenv =
5153
TERM
5254
SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST
5355
setenv =
54-
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}
56+
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:} {env:_PYTEST_FILES:}
5557

5658
# See https://docs.python.org/3/library/io.html#io-encoding-warning
5759
# If we don't enable this, neither can any of our downstream users!
@@ -66,6 +68,12 @@ setenv =
6668

6769
doctesting: _PYTEST_TOX_POSARGS_DOCTESTING=doc/en
6870

71+
# The configurations below are related only to standard unittest support.
72+
# Run only tests from test_unittest.py.
73+
asynctest: _PYTEST_FILES=testing/test_unittest.py
74+
twisted24: _PYTEST_FILES=testing/test_unittest.py
75+
twisted25: _PYTEST_FILES=testing/test_unittest.py
76+
6977
nobyte: PYTHONDONTWRITEBYTECODE=1
7078

7179
lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
@@ -79,8 +87,9 @@ deps =
7987
pexpect: pexpect>=4.8.0
8088
pluggymain: pluggy @ git+https://github.com/pytest-dev/pluggy.git
8189
pylib: py>=1.8.2
82-
unittestextras: twisted
83-
unittestextras: asynctest
90+
twisted24: twisted<25
91+
twisted25: twisted>=25
92+
asynctest: asynctest
8493
xdist: pytest-xdist>=2.1.0
8594
xdist: -e .
8695
{env:_PYTEST_TOX_EXTRA_DEP:}

0 commit comments

Comments
 (0)