diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/upload_coverage.sh | 3 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index fd276a5..55bffb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,9 +61,6 @@ matrix: env: TOXENV=flake8 - python: "2.7" - env: TOXENV=pyroma - - - python: "2.7" env: TOXENV=docs # - Let the cryptography master builds fail because they might be triggered by diff --git a/.travis/upload_coverage.sh b/.travis/upload_coverage.sh index 21026d3..02ea5f4 100755 --- a/.travis/upload_coverage.sh +++ b/.travis/upload_coverage.sh @@ -3,8 +3,9 @@ set -e set -x -NO_COVERAGE_TOXENVS=(pypy docs check-manifest pypi-readme flake8 pyroma) +NO_COVERAGE_TOXENVS=(pypy docs check-manifest pypi-readme flake8) if ! [[ "${NO_COVERAGE_TOXENVS[*]}" =~ "${TOXENV}" ]]; then source ~/.venv/bin/activate + coverage combine bash <(curl -s https://codecov.io/bash) -e TRAVIS_OS_NAME,TOXENV,OPENSSL fi @@ -1,5 +1,5 @@ [tox] -envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,pyroma,docs,coverage-report +envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster},pypi-readme,check-manifest,flake8,docs,coverage-report [testenv] whitelist_externals = |