Remove unneeded environment variables in tests

This commit is contained in:
Jack Wilsdon 2016-06-03 02:42:50 +01:00
parent 85864eb747
commit bd93d66c47
2 changed files with 17 additions and 13 deletions

View file

@ -1,22 +1,27 @@
language: python language: python
sudo: false sudo: false
env:
global:
# Undocumented feature of nose-show-skipped.
NOSE_SHOW_SKIPPED: 1
matrix: matrix:
include: include:
- python: 2.7 - python: 2.7
env: {TOX_ENV: py27-test, TOX_ARGS: --show-skipped --with-coverage, COVERAGE: 1} env: {TOX_ENV: py27-cov, COVERAGE: 1}
- python: 3.3 - python: 3.3
env: {TOX_ENV: py33-test, TOX_ARGS: --show-skipped} env: {TOX_ENV: py33-test}
- python: 3.4 - python: 3.4
env: {TOX_ENV: py34-test, TOX_ARGS: --show-skipped} env: {TOX_ENV: py34-test}
- python: 3.5 - python: 3.5
env: {TOX_ENV: py35-test, TOX_ARGS: --show-skipped} env: {TOX_ENV: py35-test}
- python: pypy - python: pypy
env: {TOX_ENV: pypy-test, TOX_ARGS: --show-skipped} env: {TOX_ENV: pypy-test}
- python: 2.7 - python: 2.7
env: {TOX_ENV: py27-flake8, TOX_ARGS: --min-version=2.7} env: {TOX_ENV: py27-flake8}
- python: 3.3 - python: 3.3
env: {TOX_ENV: py33-flake8, TOX_ARGS: --min-version=3.3} env: {TOX_ENV: py33-flake8}
- python: 2.7 - python: 2.7
env: {TOX_ENV: docs} env: {TOX_ENV: docs}
allow_failures: allow_failures:
@ -37,7 +42,7 @@ install:
- travis_retry pip install tox sphinx - travis_retry pip install tox sphinx
- travis_retry tox -e $TOX_ENV --notest - travis_retry tox -e $TOX_ENV --notest
script: tox -e $TOX_ENV -- $TOX_ARGS script: tox -e $TOX_ENV
# Report coverage to codecov.io. # Report coverage to codecov.io.
before_install: before_install:

View file

@ -3,19 +3,18 @@ build: off
deploy: off deploy: off
environment: environment:
# Undocumented feature of nose-show-skipped.
NOSE_SHOW_SKIPPED: 1
matrix: matrix:
- PYTHON: C:\Python27 - PYTHON: C:\Python27
TOX_ENV: py27-test TOX_ENV: py27-test
TOX_ARGS: --show-skipped
- PYTHON: C:\Python33 - PYTHON: C:\Python33
TOX_ENV: py33-test TOX_ENV: py33-test
TOX_ARGS: --show-skipped
- PYTHON: C:\Python34 - PYTHON: C:\Python34
TOX_ENV: py34-test TOX_ENV: py34-test
TOX_ARGS: --show-skipped
- PYTHON: C:\Python35 - PYTHON: C:\Python35
TOX_ENV: py35-test TOX_ENV: py35-test
TOX_ARGS: --show-skipped
# Install Tox for running tests. # Install Tox for running tests.
install: install:
@ -23,7 +22,7 @@ install:
- "%PYTHON%/Scripts/tox.exe -e %TOX_ENV% --notest" - "%PYTHON%/Scripts/tox.exe -e %TOX_ENV% --notest"
test_script: test_script:
- "%PYTHON%/Scripts/tox.exe -e %TOX_ENV% -- %TOX_ARGS%" - "%PYTHON%/Scripts/tox.exe -e %TOX_ENV%"
# Allow all failures for now: the tests don't yet pass! # Allow all failures for now: the tests don't yet pass!
matrix: matrix: