ci: rename "trial" tox factor to "twisted"

Ref: https://github.com/pytest-dev/pytest/pull/4848#issuecomment-467909204
This commit is contained in:
Daniel Hahler 2019-03-20 18:37:34 +01:00
parent 714f2113bb
commit 2ade3d5c89
3 changed files with 12 additions and 12 deletions

View File

@ -68,7 +68,7 @@ jobs:
# Specialized factors for py37. # Specialized factors for py37.
# Coverage for: # Coverage for:
# - test_sys_breakpoint_interception (via pexpect). # - test_sys_breakpoint_interception (via pexpect).
- env: TOXENV=py37-pexpect,py37-trial PYTEST_COVERAGE=1 - env: TOXENV=py37-pexpect,py37-twisted PYTEST_COVERAGE=1
- env: TOXENV=py37-pluggymaster-xdist - env: TOXENV=py37-pluggymaster-xdist
- env: TOXENV=py37-freeze - env: TOXENV=py37-freeze
@ -80,7 +80,7 @@ jobs:
- stage: baseline - stage: baseline
# Coverage for: # Coverage for:
# - _pytest.unittest._handle_skip (via pexpect). # - _pytest.unittest._handle_skip (via pexpect).
env: TOXENV=py27-pexpect,py27-trial PYTEST_COVERAGE=1 env: TOXENV=py27-pexpect,py27-twisted PYTEST_COVERAGE=1
python: '2.7' python: '2.7'
# Use py36 here for faster baseline. # Use py36 here for faster baseline.
- env: TOXENV=py36-xdist - env: TOXENV=py36-xdist

View File

@ -30,9 +30,9 @@ jobs:
# - numpy # - numpy
# - pytester's LsofFdLeakChecker (being skipped) # - pytester's LsofFdLeakChecker (being skipped)
PYTEST_COVERAGE: '1' PYTEST_COVERAGE: '1'
py27-trial: py27-twisted:
python.version: '2.7' python.version: '2.7'
tox.env: 'py27-trial' tox.env: 'py27-twisted'
python.needs_vc: True python.needs_vc: True
py27-pluggymaster-xdist: py27-pluggymaster-xdist:
python.version: '2.7' python.version: '2.7'
@ -40,7 +40,7 @@ jobs:
# Coverage for: # Coverage for:
# - except-IOError in _attempt_to_close_capture_file for py2. # - except-IOError in _attempt_to_close_capture_file for py2.
# Also seen with py27-nobyte (using xdist), and py27-xdist. # Also seen with py27-nobyte (using xdist), and py27-xdist.
# But no exception with py27-pexpect,py27-trial,py27-numpy. # But no exception with py27-pexpect,py27-twisted,py27-numpy.
PYTEST_COVERAGE: '1' PYTEST_COVERAGE: '1'
pypy: pypy:
python.version: 'pypy' python.version: 'pypy'
@ -76,9 +76,9 @@ jobs:
py37-linting/docs/doctesting: py37-linting/docs/doctesting:
python.version: '3.7' python.version: '3.7'
tox.env: 'linting,docs,doctesting' tox.env: 'linting,docs,doctesting'
py37-trial/numpy: py37-twisted/numpy:
python.version: '3.7' python.version: '3.7'
tox.env: 'py37-trial,py37-numpy' tox.env: 'py37-twisted,py37-numpy'
py37-pluggymaster-xdist: py37-pluggymaster-xdist:
python.version: '3.7' python.version: '3.7'
tox.env: 'py37-pluggymaster-xdist' tox.env: 'py37-pluggymaster-xdist'

10
tox.ini
View File

@ -13,7 +13,7 @@ envlist =
py38 py38
pypy pypy
pypy3 pypy3
{py27,py37}-{pexpect,xdist,trial,numpy,pluggymaster} {py27,py37}-{pexpect,xdist,twisted,numpy,pluggymaster}
py27-nobyte-xdist py27-nobyte-xdist
doctesting doctesting
py37-freeze py37-freeze
@ -67,7 +67,7 @@ basepython = python3
deps = pre-commit>=1.11.0 deps = pre-commit>=1.11.0
commands = pre-commit run --all-files --show-diff-on-failure commands = pre-commit run --all-files --show-diff-on-failure
[testenv:py27-trial] [testenv:py27-twisted]
deps = deps =
{[testenv]deps} {[testenv]deps}
twisted twisted
@ -75,9 +75,9 @@ deps =
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
[testenv:py37-trial] [testenv:py37-twisted]
deps = {[testenv:py27-trial]deps} deps = {[testenv:py27-twisted]deps}
commands = {[testenv:py27-trial]commands} commands = {[testenv:py27-twisted]commands}
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3