move all DEV dependencies to setup.py, optimize CI

- move fix lint to Travis (faster) - make sure all coverage data stays in tox work directory - remove codecov token on AppVeyor (need to pass TOXENV, and other env variables)

Author: gaborbernat

.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 language: python
-cache: python
+cache: pip
 python:
  - 2.7
  - 3.4
@@ -9,6 +9,8 @@ python:
  - 3.7-dev
  - nightly
  - pypy
+env:
+ TOXENV=py
 
 matrix:
  fast_finish: true
@@ -17,15 +19,24 @@ matrix:
  - python: nightly
  - python: pypy
  include:
- - os: osx
- language: generic
+ - python: 3.6
+ env: TOXENV=docs
+ - python: 3.6
+ env: TOXENV=fix-lint
+ - os: osx
+ language: generic
 
 before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source .travis-osx; fi
  # work around https://github.com/travis-ci/travis-ci/issues/8363
  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then pyenv global system 3.5; fi
-install: pip install -U six && pip install --pre -U tox
-script: tox -e py
+
+install:
+ - pip install -U six
+ - pip install --pre -U tox
+
+script:
+ - tox
+
 after_success:
- - tox -e coverage
- - tox -e codecov
+ - if [[ $TOXENV == "py" ]]; then tox -e coverage,codecov; fi

appveyor.yml

@@ -1,6 +1,6 @@
+build: false # Not a C# project
 environment:
  matrix:
- - TOXENV: fix-lint
  - TOXENV: py27
  - TOXENV: py34
  - TOXENV: py35
@@ -9,12 +9,14 @@ environment:
 matrix:
  fast_finish: true
 
-build: false # Not a C# project
-install: C:\Python36\python -m pip install --pre -U tox
-test_script: C:\Python36\scripts\tox
+install:
+ - C:\Python36\python -m pip install --pre -U tox
+
+test_script:
+ - C:\Python36\scripts\tox
+
 after_test:
- - if exist .tox\.coverage.* (C:\Python36\scripts\tox -e coverage) else (echo no .coverage files)
- - if exist .tox\coverage.xml (C:\Python36\scripts\tox -e codecov) else (echo no coverage.xml)
+ - C:\Python36\scripts\tox -e coverage,codecov
 
 cache:
  - '%LOCALAPPDATA%\pip\cache'

setup.py

@@ -50,6 +50,17 @@ def main():
  'pluggy>=0.3.0,<1.0',
  'six',
  'virtualenv>=1.11.2'],
+ extras_require={'testing': ['pytest >= 3.0.0',
+ 'pytest-cov',
+ 'pytest-timeout',
+ 'pytest-xdist'],
+ 'docs': ['sphinx >= 1.6.3, < 2',
+ 'towncrier >= 17.8.0'],
+ 'lint': ['flake8 == 3.4.1',
+ 'flake8-bugbear == 17.4.0',
+ 'pre-commit == 1.3.0'],
+ 'publish': ['devpi',
+ 'twine']},
  classifiers=['Development Status :: 5 - Production/Stable',
  'Intended Audience :: Developers',
  'License :: OSI Approved :: MIT License',

tox.ini

@@ -1,95 +1,94 @@
 [tox]
-envlist = py27,py34,py35,py36,pypy,style,docs
-minversion = 2.7.0
+envlist = py27,
+ py34,
+ py35,
+ py36,
+ pypy,
+ coverage,
+ fix-lint,
+ docs
+minversion = 2.9.0
+skip_missing_interpreters = true
 
 [testenv]
-description = run the unit tests with pytest under the current Python env
+description = run the unit tests with pytest under {basepython}
 setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-passenv = http_proxy https_proxy no_proxy SSL_CERT_FILE CI TRAVIS TRAVIS_*
-deps = pytest >= 3.0.0
- pytest-cov
- pytest-timeout
- pytest-xdist
-;NOTE --cov-config={toxinidir}/tox.ini is necessary until
-;https://github.com/pytest-dev/pytest-cov/issues/168 is fixed
-commands = pytest {posargs:tests} --cov-config="{toxinidir}/tox.ini" --cov="{envsitepackagesdir}/tox" --timeout=180
-
-[testenv:dev]
-description = DEV environment, if no posarg is specified: run pytest
-# required to make looponfail reload on every source code change
-usedevelop = True
-commands = {posargs:py.test -s -x -f -v}
+passenv = http_proxy https_proxy no_proxy SSL_CERT_FILE TOXENV CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_*
+extras = testing
+commands = pytest {posargs:--cov-config={toxinidir}/tox.ini --cov={envsitepackagesdir}/tox --timeout=180 tests}
 
 [testenv:docs]
 description = invoke sphinx-build to build the HTML docs, check that URIs are valid
 basepython = python3.6
-deps = sphinx >= 1.6.3, < 2
- towncrier >= 17.8.0
- {[testenv]deps}
-commands = sphinx-build -d "{toxworkdir}/docs_doctree" doc "{toxworkdir}/docs_out" --color -W -bhtml
- sphinx-build -d "{toxworkdir}/docs_doctree" doc "{toxworkdir}/docs_out" --color -W -blinkcheck
+extras = docs
+commands = sphinx-build -d {toxworkdir}/docs_doctree doc {toxworkdir}/docs_out --color -W -bhtml
+ sphinx-build -d {toxworkdir}/docs_doctree doc {toxworkdir}/docs_out --color -W -blinkcheck
 
 [testenv:fix-lint]
 basepython = python3.6
 passenv = {[testenv]passenv}
  HOMEPATH
-deps = flake8 == 3.4.1
- flake8-bugbear == 17.4.0
- pre-commit == 1.3.0
+extras = lint
 description = run static analysis and style check using flake8
 commands = python -m flake8 --show-source tox setup.py {posargs}
  python -m flake8 --show-source doc tests {posargs}
  pre-commit run --all-files
- echo "hint: run {envdir}/bin/pre-commit install" to add checks as pre-commit hook
+ python -c 'print("hint: run {envdir}/bin/pre-commit install to add checks as pre-commit hook")'
 
-[flake8]
-max-complexity = 22
-max-line-length = 99
-
-[testenv:X]
-description = print the positional arguments passed in with echo
-commands = echo {posargs}
 
 [testenv:coverage]
-description = [run locally after tests]: combine coverage data and create reports
-skip_install = True
-setenv = COVERAGE_FILE={toxworkdir}/.coverage
+description = combine coverage data and create reports
 deps = coverage
+skip_install = True
+changedir = {toxworkdir}
+setenv = COVERAGE_FILE=.coverage
 commands = coverage erase
  coverage combine
+ coverage report --rcfile={toxinidir}/tox.ini
  coverage xml
- coverage html
 
 [testenv:codecov]
-description = [only run on CI]: upload coverage data to codecov
-;NOTE token should not be necesssary but seems to be on appveyor
-setenv = {[testenv:coverage]setenv}
- CODECOV_TOKEN = 01eb408d-0640-4527-a5f6-9dfe30f9f2ba
+description = [only run on CI]: upload coverage data to codecov (depends on coverage running first)
 deps = codecov
-commands = codecov --required
+skip_install = True
+commands = codecov --file {toxworkdir}/coverage.xml
 
 [testenv:pra]
 passenv = *
 description = "personal release assistant" - see HOWTORELEASE.rst
-skip_install = True
-deps = devpi
- towncrier
- twine
-commands = "{toxinidir}/tasks/pra.sh" {posargs}
+extras = publish, docs
+commands = {toxinidir}/tasks/pra.sh {posargs}
+
+[testenv:X]
+description = print the positional arguments passed in with echo
+commands = echo {posargs}
+
+[testenv:dev]
+description = generate a DEV environment
+extras = testing, docs, lint
+# required to make looponfail reload on every source code change
+usedevelop = True
+commands = python -m pip list --format=columns
+ python -c 'import sys; print(sys.executable)'
+
+[flake8]
+max-complexity = 22
+max-line-length = 99
 
 [coverage:run]
-branch = True
-source = tox
 omit = tox/__main__.py
 
+[coverage:report]
+skip_covered = True
+show_missing = True
+exclude_lines = if __name__ == ["']__main__["']:
+
 [coverage:paths]
 source = tox
  {toxworkdir}/*/lib/python*/site-packages/tox
+ {toxworkdir}/*/Lib/site-packages/tox
  {toxworkdir}/pypy*/site-packages/tox
 
-[coverage:report]
-exclude_lines = if __name__ == ["']__main__["']:
-
 [pytest]
 addopts = -rsxX
 rsyncdirs = tests tox