diff --git a/jenkins.sh b/jenkins.sh index d5ca14b..2537258 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -6,4 +6,4 @@ rm -f coverage.xml rm -f test_results.xml pip install --upgrade tox -tox -r -e coverage-{dj17,dj18,dj19,dj110} +tox -r -e coverage-{dj18,dj19,dj110} diff --git a/tox.ini b/tox.ini index 00e6a71..618b48d 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/bijoe/ -envlist = dj17,dj18,dj110 +envlist = dj18,dj110 [testenv] usedevelop = true @@ -13,13 +13,10 @@ setenv = DJANGO_SETTINGS_MODULE=bijoe.settings coverage: COVERAGE=--junit-xml=test_results.xml --cov=bijoe --cov-report xml deps = - dj17: django>=1.7,<1.8 dj18: django>=1.8,<1.9 dj19: django>=1.9,<1.10 dj110: django>=1.10,<1.11 dj111: django>=1.11,<1.12 - dj17: django-jsonfield<1.0 - dj17: Django-Select2<5 dj18,dj19,dj110: Django-Select2>=5 coverage pytest @@ -27,7 +24,6 @@ deps = pytest-random pytest-django WebTest - dj17: django-webtest<1.9 dj18,dj19,dj110: django-webtest commands = py.test {env:COVERAGE:} {posargs:--nomigrations --random tests}