Skip to content

Commit

Permalink
Merge pull request cookiecutter#1019 from asottile/TOXENV
Browse files Browse the repository at this point in the history
Use tox's TOXENV environ variable
  • Loading branch information
hackebrot authored Mar 20, 2018
2 parents 881c52d + c6434d0 commit fc3040b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ language: python
matrix:
include:
- python: 2.7
env: TOX_ENV=py27
env: TOXENV=py27
- python: 3.3
env: TOX_ENV=py33
env: TOXENV=py33
- python: 3.4
env: TOX_ENV=py34
env: TOXENV=py34
- python: 3.5
env: TOX_ENV=py35
env: TOXENV=py35
- python: 3.6
env: TOX_ENV=py36
env: TOXENV=py36
- python: pypy
env: TOX_ENV=pypy
env: TOXENV=pypy
- python: 3.5
env: TOX_ENV=flake8
env: TOXENV=flake8

script: tox -e $TOX_ENV
script: tox

install:
- pip install tox
Expand All @@ -30,4 +30,4 @@ after_success:
# Report coverage results to codecov.io
# and export tox environment variables
- pip install codecov
- codecov -e TOX_ENV TRAVIS_OS_NAME
- codecov -e TOXENV TRAVIS_OS_NAME
24 changes: 12 additions & 12 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@
environment:
matrix:
- PYTHON: "C:\\Python27"
TOX_ENV: "py27"
TOXENV: "py27"

- PYTHON: "C:\\Python27-x64"
TOX_ENV: "py27"
TOXENV: "py27"

- PYTHON: "C:\\Python33"
TOX_ENV: "py33"
TOXENV: "py33"

- PYTHON: "C:\\Python33-x64"
TOX_ENV: "py33"
TOXENV: "py33"

- PYTHON: "C:\\Python34"
TOX_ENV: "py34"
TOXENV: "py34"

- PYTHON: "C:\\Python34-x64"
TOX_ENV: "py34"
TOXENV: "py34"

- PYTHON: "C:\\Python35"
TOX_ENV: "py35"
TOXENV: "py35"

- PYTHON: "C:\\Python35-x64"
TOX_ENV: "py35"
TOXENV: "py35"

- PYTHON: "C:\\Python36"
TOX_ENV: "py36"
TOXENV: "py36"

- PYTHON: "C:\\Python36-x64"
TOX_ENV: "py36"
TOXENV: "py36"

init:
- set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
Expand All @@ -47,7 +47,7 @@ install:
build: false # Not a C# project, build stuff at the test step instead.

test_script:
- "%PYTHON%/Scripts/tox -e %TOX_ENV%"
- "%PYTHON%/Scripts/tox"

after_test:
- "%PYTHON%/python setup.py bdist_wheel"
Expand All @@ -58,7 +58,7 @@ on_success:
# and export tox environment variables
- "%PYTHON%/Scripts/pip install codecov"
- set OS=WINDOWS
- "%PYTHON%/Scripts/codecov -e TOX_ENV OS"
- "%PYTHON%/Scripts/codecov -e TOXENV OS"

artifacts:
- path: dist\*
Expand Down

0 comments on commit fc3040b

Please sign in to comment.