update azure pipelines and tox configs

5 files changed, 70 insertions, 162 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 8d90295..0000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-environment:
-  global:
-    TOXENV: py,codecov
-
-  matrix:
-    - PYTHON: C:\Python37-x64
-    - PYTHON: C:\Python27-x64
-    - PYTHON: C:\Python37
-    - PYTHON: C:\Python27
-
-init:
-  - SET PATH=%PYTHON%;%PATH%
-
-install:
-  - python -m pip install -U tox
-
-build: false
-
-test_script:
-  - python -m tox
-
-branches:
-  only:
-    - master
-    - /^.*\.x$/
-
-cache:
-  - '%LOCALAPPDATA%\pip\Cache'
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
new file mode 100644
index 0000000..6487d77
--- /dev/null
+++ b/.azure-pipelines.yml
@@ -0,0 +1,61 @@
+trigger:
+  - master
+  - "*.x"
+
+variables:
+  vmImage: ubuntu-latest
+  python.version: "3.7"
+  TOXENV: py,coverage-ci
+  hasTestResults: true
+
+strategy:
+  matrix:
+    Python 3.7 Linux:
+      vmImage: ubuntu-latest
+    Python 3.7 Windows:
+      vmImage: windows-latest
+    Python 3.7 Mac:
+      vmImage: macos-latest
+    PyPy 3 Linux:
+      python.version: pypy3
+    Python 3.6 Linux:
+      python.version: 3.6
+    Python 3.5 Linux:
+      python.version: 3.5
+    Python 2.7 Linux:
+      python.version: 2.7
+    Python 2.7 Windows:
+      python.version: 2.7
+      vmImage: windows-latest
+    Docs:
+      TOXENV: docs
+      hasTestResults: false
+
+pool:
+  vmImage: $(image)
+
+steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: "$(python.version)"
+    displayName: Use Python $(python.version)
+
+  - script: pip --disable-pip-version-check install -U tox
+    displayName: Install tox
+
+  - script: tox -s false -- --junit-xml=test-results.xml
+    displayName: Run tox
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFiles: test-results.xml
+      testRunTitle: $(Agent.JobName)
+    condition: eq(variables['hasTestResults'], 'true')
+    displayName: Publish test results
+
+  - task: PublishCodeCoverageResults@1
+    inputs:
+      codeCoverageTool: Cobertura
+      summaryFileLocation: coverage.xml
+    condition: eq(variables['hasTestResults'], 'true')
+    displayName: Publish coverage results
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3018973..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-os: linux
-sudo: false
-language: python
-python:
-  - "3.6"
-  - "3.5"
-  - "3.4"
-  - "2.7"
-  - "nightly"
-  - "pypy3"
-  - "pypy"
-env: TOXENV=py,codecov
-
-matrix:
-  include:
-    - env: TOXENV=docs-html
-    - os: osx
-      language: generic
-      env: TOXENV=py3,py2,codecov
-      cache:
-        pip: false
-        directories:
-          - $HOME/Library/Caches/Homebrew
-          - $HOME/Library/Caches/pip
-  allow_failures:
-    - python: nightly
-    - python: pypy3
-    - python: pypy
-    - os: osx
-  fast_finish: true
-
-before_install:
-  - |
-    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-      brew upgrade python
-      brew install python@2
-      export PATH="/usr/local/opt/python/libexec/bin:${PATH}"
-    fi
-
-install:
-  - pip install tox
-
-script:
-  - tox
-
-cache:
-  - pip
-
-branches:
-  only:
-    - master
-    - /^.*\.x$/
-
-notifications:
-  email: false
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 83d470b..0000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Python package
-# Create and test a Python package on multiple Python versions.
-# Add steps that analyze code, save the dist with the build record, 
-# publish to a PyPI-compatible index, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/python
-variables:
-  latestPythonVersion: '3.7'
-
-trigger:
-- master
-
-strategy:
-  matrix:
-    # Test across operating systems on latest Python version
-    linuxLatest:
-      image: ubuntu-16.04
-      python.version: $(latestPythonVersion)
-      toxenv: py,codecov
-    macOSLatest:
-      image: macos-10.13
-      python.version: $(latestPythonVersion)
-      toxenv: py,codecov
-    windowsLatest:
-      image: vs2017-win2016
-      python.version: $(latestPythonVersion)
-      toxenv: py,codecov
-    # Test across previous Python versions
-    linuxPython36:
-      image: ubuntu-16.04
-      python.version: '3.6'
-      toxenv: py,codecov
-    linuxPython35:
-      image: ubuntu-16.04
-      python.version: '3.5'
-      toxenv: py,codecov
-    linuxPython27:
-      image: ubuntu-16.04
-      python.version: '2.7'
-      toxenv: py,codecov
-    # Docs
-    docs:
-      image: ubuntu-16.04
-      python.version: $(latestPythonVersion)
-      toxenv: docs-html
-
-pool:
-  vmImage: $(image)
-
-steps:
-- task: UsePythonVersion@0
-  inputs:
-    versionSpec: '$(python.version)'
-  displayName: 'Use Python $(python.version) on $(vmImage)'
-
-- script: |
-    python -m pip install --upgrade pip
-    pip install tox
-  displayName: 'Install tox'
-
-- script: tox
-  env: 
-    TOXENV: toxenv
-  displayName: 'Run tox'
diff --git a/tox.ini b/tox.ini
index a44b110..51ba92a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,39 +1,32 @@
 [tox]
 envlist =
-    py{37,36,35,34,27,py3,py}
-    docs-html
-    coverage-report
+    py{37,36,35,27,py3,py}
+    docs
+    coverage
 skip_missing_interpreters = true
 
 [testenv]
-passenv = LANG
 deps =
     pytest
     coverage
     colorama
-commands = coverage run -p -m pytest {posargs}
+commands = coverage run -p -m pytest --tb=short -Werror --basetemp={envtmpdir} {posargs}
 
-[testenv:docs-html]
+[testenv:docs]
 deps = -r docs/requirements.txt
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
 
-[testenv:docs-linkcheck]
-deps = -r docs/requirements.txt
-commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs {envtmpdir}/linkcheck
-
-[testenv:coverage-report]
+[testenv:coverage]
 deps = coverage
 skip_install = true
 commands =
     coverage combine
-    coverage report
     coverage html
+    coverage report
 
-[testenv:codecov]
-passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
+[testenv:coverage-ci]
 deps = codecov
 skip_install = true
 commands =
     coverage combine
-    coverage report
-    codecov
+    coverage xml