summaryrefslogtreecommitdiff
path: root/azure-pipelines.yml
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-03-26 10:23:21 +0100
committerDaniel Hahler <git@thequod.de>2019-03-26 10:23:21 +0100
commite1ae4695043dacfa9ab3349221e3584168495571 (patch)
treef9a2485c01293b1d9ca2b5e995517091ec98967b /azure-pipelines.yml
parent4148663706ea4158b1f54b94360d2a57cfcdecc9 (diff)
parent3e1971eb16eebd4fa24428d75d221b4688419a16 (diff)
downloadpytest-e1ae4695043dacfa9ab3349221e3584168495571.tar.gz
Merge master into features
Diffstat (limited to 'azure-pipelines.yml')
-rw-r--r--azure-pipelines.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 89ed9791f..2d225bafc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,9 +30,9 @@ jobs:
# - numpy
# - pytester's LsofFdLeakChecker (being skipped)
PYTEST_COVERAGE: '1'
- py27-trial:
+ py27-twisted:
python.version: '2.7'
- tox.env: 'py27-trial'
+ tox.env: 'py27-twisted'
python.needs_vc: True
py27-pluggymaster-xdist:
python.version: '2.7'
@@ -40,7 +40,7 @@ jobs:
# Coverage for:
# - except-IOError in _attempt_to_close_capture_file for py2.
# 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'
pypy:
python.version: 'pypy'
@@ -76,9 +76,9 @@ jobs:
py37-linting/docs/doctesting:
python.version: '3.7'
tox.env: 'linting,docs,doctesting'
- py37-trial/numpy:
+ py37-twisted/numpy:
python.version: '3.7'
- tox.env: 'py37-trial,py37-numpy'
+ tox.env: 'py37-twisted,py37-numpy'
py37-pluggymaster-xdist:
python.version: '3.7'
tox.env: 'py37-pluggymaster-xdist'