update test env matrix

re-enable windows on appveyor
enable osx on travis

Author: davidism

.appveyor.yml

@@ -0,0 +1,28 @@
+environment:
+  global:
+    TOXENV: py,codecov
+
+  matrix:
+    - PYTHON: C:\Python36-x64
+    - PYTHON: C:\Python27-x64
+    - PYTHON: C:\Python36
+    - 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
+    - /^.*-maintenance$/
+
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'

.ci/appveyor.yml

@@ -1,43 +1,56 @@
+os: linux
 sudo: false
 language: python
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "pypy"
 
-env:
-  - TEST_EXTRA=
-  - TEST_EXTRA=colorama
+matrix:
+  include:
+    - python: 3.6
+      env: TOXENV=py,codecov
+    - python: 3.5
+      env: TOXENV=py,codecov
+    - python: 3.4
+      env: TOXENV=py,codecov
+    - python: 2.7
+      env: TOXENV=py,codecov
+    - python: pypy3
+      env: TOXENV=py,codecov
+    - python: nightly
+      env: TOXENV=py
+    - os: osx
+      language: generic
+      env: TOXENV=py3,py2,codecov
+      cache:
+        pip: false
+        directories:
+          - $HOME/Library/Caches/Homebrew
+          - $HOME/Library/Caches/pip
+  allow_failures:
+    - python: pypy3
+    - python: nightly
+    - 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:
-  - |
-    set -ex
-    if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then
-      TOX_PY=pypy
-    else
-      TOX_PY="py${TRAVIS_PYTHON_VERSION/./}"
-    fi
-    export TOXENV="${TOX_PY}-coverage"
-    if [[ $TEST_EXTRA == colorama ]]; then
-      TOXENV="$TOXENV-colorama"
-    fi
-    tox
-    set +x
+  - tox
+
+cache:
+  - pip
 
 branches:
   only:
     - master
-    - auto
-    - /^.*-maintenance$/
+    - /^.*-maintenance/
 
 notifications:
   email: false
-
-after_success:
-  - pip install codecov
-  - travis_retry codecov --env TOXENV -X fix search gcov --required --flags $TOX_PY $TEST_EXTRA

.ci/run_with_env.cmd

@@ -1,13 +1,35 @@
 [tox]
-envlist = py27,py34,py35,py36,pypy
-skip_missing_interpreters = true
+envlist = py{36,35,34,27,py}
 
 [testenv]
 passenv = LANG
-commands = {env:TEST_RUNNER:pytest} {posargs}
 deps =
     pytest
-    colorama: colorama
-    coverage: coverage
-setenv =
-    coverage: TEST_RUNNER=coverage run -m pytest
+    coverage
+    colorama
+commands = coverage run -p -m pytest {posargs:tests}
+
+[testenv:docs-html]
+deps = sphinx
+commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
+
+[testenv:docs-linkcheck]
+deps = sphinx
+commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs {envtmpdir}/linkcheck
+
+[testenv:coverage-report]
+deps = coverage
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    coverage html
+
+[testenv:codecov]
+passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
+deps = codecov
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    codecov