Browse Source

Attempt to fix codecov

Ask Solem 8 years ago
parent
commit
575d2eea8a
2 changed files with 6 additions and 10 deletions
  1. 3 0
      .travis.yml
  2. 3 10
      tox.ini

+ 3 - 0
.travis.yml

@@ -43,6 +43,9 @@ before_install:
             virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
             virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
             source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
             source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
           fi
           fi
+after_success:
+  - .tox/$TRAVIS_PYTHON_VERSION/bin/coverage xml
+  - .tox/$TRAVIS_PYTHON_VERSION/bin/codecov -e TOXENV
 install: travis_retry pip install -U tox
 install: travis_retry pip install -U tox
 script: tox -v -- -v
 script: tox -v -- -v
 notifications:
 notifications:

+ 3 - 10
tox.ini

@@ -8,14 +8,13 @@ envlist =
     apicheck
     apicheck
     configcheck
     configcheck
     pydocstyle
     pydocstyle
-    cov
 
 
 [testenv]
 [testenv]
 deps=
 deps=
     -r{toxinidir}/requirements/default.txt
     -r{toxinidir}/requirements/default.txt
     -r{toxinidir}/requirements/test.txt
     -r{toxinidir}/requirements/test.txt
 
 
-    2.7,cov: -r{toxinidir}/requirements/test-ci-default.txt
+    2.7: -r{toxinidir}/requirements/test-ci-default.txt
     3.4,3.5: -r{toxinidir}/requirements/test-ci-default.txt
     3.4,3.5: -r{toxinidir}/requirements/test-ci-default.txt
     pypy,pypy3: -r{toxinidir}/requirements/test-ci-base.txt
     pypy,pypy3: -r{toxinidir}/requirements/test-ci-base.txt
 
 
@@ -26,7 +25,7 @@ deps=
 sitepackages = False
 sitepackages = False
 recreate = False
 recreate = False
 commands =
 commands =
-    unit: py.test -xv
+    unit: py.test -xv --cov=celery --cov-report=xml
     integration: py.test -xsv t/integration
     integration: py.test -xsv t/integration
 setenv =
 setenv =
     WORKER_LOGLEVEL = INFO
     WORKER_LOGLEVEL = INFO
@@ -43,13 +42,7 @@ basepython =
     3.5: python3.5
     3.5: python3.5
     pypy: pypy
     pypy: pypy
     pypy3: pypy3
     pypy3: pypy3
-    flake8,flakeplus,apicheck,linkcheck,configcheck,pydocstyle,cov: python2.7
-
-[testenv:cov]
-commands =
-    py.test -xv --cov=celery --cov-report=xml
-    coverage xml
-    codecov -e TOXENV --token=bb6ecc30-6d40-4f57-942e-406f5f579198 --required
+    flake8,flakeplus,apicheck,linkcheck,configcheck,pydocstyle: python2.7
 
 
 [testenv:apicheck]
 [testenv:apicheck]
 commands =
 commands =