Collect PyPy and AppVeyor coverage using tox

Coverage of PyPy was disabled however it works
without trouble, albeit a little slow.

To allow tox to run tests under coverage,
and with arguments passed to coverage,
PYTEST_COMMAND can now be used to override
the default command used to run the tests.

Due to pips inability to deal with multiple
requirements for the same package, six==1.9 is
forcably installed after the tox environment
has been setup.

.appveyor.yml

@@ -2,6 +2,7 @@
 environment:
  global:
  PATH: "C:\\Python27\\Scripts\\;%PATH%"
+ PYTEST_COMMAND: "coverage run -m pytest"
  matrix:
  - TOXENV: py27-base
  - TOXENV: py27-optional
@@ -16,7 +17,7 @@ environment:
 
 install:
  - git submodule update --init --recursive
- - python -m pip install tox
+ - python -m pip install tox codecov
 
 build: off
 
@@ -25,3 +26,6 @@ test_script:
 
 after_test:
  - python debug-info.py
+
+on_success:
+ - codecov

.travis.yml

@@ -12,20 +12,21 @@ sudo: false
 cache: pip
 
 env:
- - USE_OPTIONAL=true
- - USE_OPTIONAL=false
- - SIX_VERSION=1.9 USE_OPTIONAL=true
+ global:
+ - PYTEST_COMMAND="coverage run -m pytest"
+ matrix:
+ - TOXENV=optional
+ - TOXENV=base
+ - TOXENV=six19-optional
 
 install:
- - ./requirements-install.sh
+ - pip install tox codecov
 
 script:
- - if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then py.test; fi
- - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then coverage run -m pytest; fi
- - bash flake8-run.sh
+ - tox
 
 after_script:
  - python debug-info.py
 
 after_success:
- - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then codecov; fi
+ - codecov

requirements-test.txt

@@ -1,6 +1,10 @@
 -r requirements.txt
 
+tox
+
 flake8<3.0
+
 pytest
+coverage
 pytest-expect>=1.1,<2.0
 mock

tox.ini

@@ -1,21 +1,23 @@
 [tox]
-envlist = {py27,py33,py34,py35,py36,pypy}-{base,optional}
+envlist = {py27,py33,py34,py35,py36,pypy}-{base,six19,optional}
 
 [testenv]
 deps =
- flake8<3.0
- pytest
- pytest-expect>=1.1,<2.0
- mock
- base: six
- base: webencodings
  optional: -r{toxinidir}/requirements-optional.txt
+ -r{toxinidir}/requirements-test.txt
  doc: Sphinx
 
+passenv =
+ PYTEST_COMMAND
+ COVERAGE_RUN_OPTIONS
 commands =
- {envbindir}/py.test {posargs}
+ six19: pip install six==1.9
+ {env:PYTEST_COMMAND:{envbindir}/py.test} {posargs}
  flake8 {toxinidir}
 
 [testenv:doc]
 changedir = doc
 commands = sphinx-build -b html . _build
+
+[flake8]
+exclude = ./.tox