Permalink
Browse files

bring back codecov + fix syntax pip install + fix tox.ini indentation

  • Loading branch information...
benjaoming committed Oct 7, 2017
1 parent ac36d0e commit 95511a91f8ca0b56ae7647ce2d67c5d43d1e37ad
Showing with 34 additions and 34 deletions.
  1. +2 −4 .travis.yml
  2. +32 −30 tox.ini
View
@@ -15,7 +15,6 @@ env:
- DJANGO="1.9"
- DJANGO="1.10"
- DJANGO="1.11"
# - PIP_DOWNLOAD_CACHE="pip_cache"
matrix:
exclude:
@@ -32,15 +31,14 @@ matrix:
- python: "3.6"
env: DJANGO="1.10"
addons:
apt:
packages:
- libjpeg8
- libjpeg8-dev
install:
- pip install tox>=2.1 tox-travis
- pip install tox\>=2.1 tox-travis codecov
script:
- tox
@@ -50,4 +48,4 @@ notifications:
- "irc.freenode.org#django-wiki"
after_success:
- bash <(curl -s https://codecov.io/bash)
- codecov
View
62 tox.ini
@@ -21,47 +21,49 @@ LINT =
[testenv]
passenv = INCLUDE_SELENIUM_TESTS SELENIUM_SHOW_BROWSER
passenv =
INCLUDE_SELENIUM_TESTS
SELENIUM_SHOW_BROWSER
commands =
{toxinidir}/runtests.py --basetemp={envtmpdir} --ds=tests.settings --cov=src/wiki --cov-config .coveragerc {posargs}
{toxinidir}/runtests.py --basetemp={envtmpdir} --ds=tests.settings --cov=src/wiki --cov-config .coveragerc {posargs}
usedevelop = true
deps =
coverage
pytest==3.0.7
pytest-django==3.1.2
pytest-pythonpath==0.7.1
pytest-cov==2.4.0
Pillow==2.3.0
django-classy-tags==0.4
six>=1.9
mock>=2.0
Markdown==2.6.7
django_nyt==1.0b1
bleach==1.5.0
django18: Django==1.8.2
django19: Django==1.9
django110: Django==1.10.2
django111: Django==1.11
django-mptt==0.8.6
django-sekizai==0.10.0
sorl-thumbnail==12.3
django-functest==1.0.2
django-webtest==1.9.2
WebTest==2.0.28
coverage
pytest==3.0.7
pytest-django==3.1.2
pytest-pythonpath==0.7.1
pytest-cov==2.4.0
Pillow==2.3.0
django-classy-tags==0.4
six>=1.9
mock>=2.0
Markdown==2.6.7
django_nyt==1.0b1
bleach==1.5.0
django18: Django==1.8.2
django19: Django==1.9
django110: Django==1.10.2
django111: Django==1.11
django-mptt==0.8.6
django-sekizai==0.10.0
sorl-thumbnail==12.3
django-functest==1.0.2
django-webtest==1.9.2
WebTest==2.0.28
basepython =
py27: python2.7
py34: python3.4
py35: python3.5
py36: python3.6
py27: python2.7
py34: python3.4
py35: python3.5
py36: python3.6
[testenv:lint]
basepython = python2.7
deps = flake8
commands =
flake8 src/wiki
flake8 tests/
flake8 src/wiki
flake8 tests/

0 comments on commit 95511a9

Please sign in to comment.