Commit1b515f5

authored

Merge pull request#364 from jayvdb/codecov

Re-enable codecov

2 parents32713a5 +e17cf26 commit1b515f5Copy full SHA for 1b515f5

File tree

+29

-18

lines changed

+29

-18

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`environment:`
`3`	`3`	`global:`
`4`	`4`	`PATH:"C:\\Python27\\Scripts\\;%PATH%"`
	`5`	`+PYTEST_COMMAND:"coverage run -m pytest"`
`5`	`6`	`matrix:`
`6`	`7`	`-TOXENV:py27-base`
`7`	`8`	`-TOXENV:py27-optional`
`@@ -16,7 +17,7 @@ environment:`
`16`	`17`
`17`	`18`	`install:`
`18`	`19`	`-git submodule update --init --recursive`
`19`		`- -python -m pip install tox`
	`20`	`+ -python -m pip install tox codecov`
`20`	`21`
`21`	`22`	`build:off`
`22`	`23`
`@@ -25,3 +26,6 @@ test_script:`
`25`	`26`
`26`	`27`	`after_test:`
`27`	`28`	`-python debug-info.py`
	`29`	`+`
	`30`	`+on_success:`
	`31`	`+ -codecov`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,21 @@ sudo: false`
`12`	`12`	`cache:pip`
`13`	`13`
`14`	`14`	`env:`
`15`		`- -USE_OPTIONAL=true`
`16`		`- -USE_OPTIONAL=false`
`17`		`- -SIX_VERSION=1.9 USE_OPTIONAL=true`
	`15`	`+global:`
	`16`	`+ -PYTEST_COMMAND="coverage run -m pytest"`
	`17`	`+matrix:`
	`18`	`+ -TOXENV=optional`
	`19`	`+ -TOXENV=base`
	`20`	`+ -TOXENV=six19-optional`
`18`	`21`
`19`	`22`	`install:`
`20`		`- -./requirements-install.sh`
	`23`	`+ -pipinstall tox codecov`
`21`	`24`
`22`	`25`	`script:`
`23`		`- -if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then py.test; fi`
`24`		`- -if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then coverage run -m pytest; fi`
`25`		`- -bash flake8-run.sh`
	`26`	`+ -tox`
`26`	`27`
`27`	`28`	`after_script:`
`28`	`29`	`-python debug-info.py`
`29`	`30`
`30`	`31`	`after_success:`
`31`		`- -if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then coverage combine &&codecov; fi`
	`32`	`+ -codecov`

Lines changed: 5 additions & 1 deletion

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,23 @@`
`1`	`1`	`[tox]`
`2`		`-envlist = {py27,py33,py34,py35,py36,pypy}-{base,optional}`
	`2`	`+envlist = {py27,py33,py34,py35,py36,pypy}-{base,six19,optional}`
`3`	`3`
`4`	`4`	`[testenv]`
`5`	`5`	`deps =`
`6`		`- flake8<3.0`
`7`		`- pytest`
`8`		`- pytest-expect>=1.1,<2.0`
`9`		`- mock`
`10`		`- base: six`
`11`		`- base: webencodings`
`12`	`6`	`optional: -r{toxinidir}/requirements-optional.txt`
	`7`	`+ -r{toxinidir}/requirements-test.txt`
`13`	`8`	`doc: Sphinx`
`14`	`9`
	`10`	`+passenv =`
	`11`	`+ PYTEST_COMMAND`
	`12`	`+ COVERAGE_RUN_OPTIONS`
`15`	`13`	`commands =`
`16`		`- {envbindir}/py.test {posargs}`
	`14`	`+ six19: pip installsix==1.9`
	`15`	`+ {env:PYTEST_COMMAND:{envbindir}/py.test} {posargs}`
`17`	`16`	`flake8 {toxinidir}`
`18`	`17`
`19`	`18`	`[testenv:doc]`
`20`	`19`	`changedir = doc`
`21`	`20`	`commands = sphinx-build -b html . _build`
	`21`	`+`
	`22`	`+[flake8]`
	`23`	`+exclude = ./.tox`

Comments

(0)