diff options
| author | Timothy Edmund Crosley <timothy.crosley@gmail.com> | 2019-03-03 11:31:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 11:31:50 -0800 |
| commit | 7483a27a38084c5c0464cf78400d321f57f7b74f (patch) | |
| tree | e2e652c2d63fe920a9d7c5a0b16d1869ff55d3fe | |
| parent | 287231d25aa8cd7ac58c2c3ad5ade31feee6a078 (diff) | |
| parent | e85c774c7de41163f6e8a692cb76f596e392b88c (diff) | |
| download | isort-7483a27a38084c5c0464cf78400d321f57f7b74f.tar.gz | |
Merge pull request #870 from blueyed/pytest-cfg
ci/tests: revisit config/setup
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | appveyor.yml | 26 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 31 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 1fbffbab..0cd3f4c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ dist: xenial -sudo: false language: python cache: pip +env: + - global: + - PYTEST_ADDOPTS=-vv +python: 3.7 matrix: include: - - python: 3.7 - env: TOXENV=isort-check - - python: 3.7 - env: TOXENV=lint - - python: 3.7 - env: TOXENV=mypy + - env: TOXENV=isort-check + - env: TOXENV=lint + - env: TOXENV=mypy - python: 3.4 env: TOXENV=py34-coverage - python: 3.5 diff --git a/appveyor.yml b/appveyor.yml index 636ce96f..df16a10a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,32 @@ init: - - "SET PATH=C:\\Python27\\Scripts;%PATH%" + - "SET PATH=C:\\Python37\\Scripts;%PATH%" + - "SET PYTEST_ADDOPTS=-vv" - "ECHO PATH=%PATH%" - - python --version build: off +environment: + matrix: + - TOXENV: "isort-check" + - TOXENV: "lint" + - TOXENV: "mypy" + - TOXENV: "py34-coverage" + - TOXENV: "py35-coverage" + - TOXENV: "py36-coverage" + - TOXENV: "py37-coverage" + install: - pip install tox test_script: - - tox -e isort-check,py34,py35,py36,py37 + - tox + +on_success: + # Add tox environment to PATH. + - "SET PATH=%CD%\\.tox\\%TOXENV%\\scripts;%PATH%" + - IF NOT "x%TOXENV:-coverage=%"=="x%TOXENV%" ( + pip install codecov && + coverage xml && + coverage report -m && + codecov --required -X gcov pycov search -f coverage.xml -n %TOXENV%-windows + ) @@ -16,7 +16,7 @@ extras = requirements setenv = coverage: PYTEST_ADDOPTS=--cov {env:PYTEST_ADDOPTS:} -commands = py.test -vv -s test_isort.py {posargs} +commands = pytest {posargs} [testenv:isort-check] basepython = python3 |