Revert "jenkins.sh: launch tests with tox in django 1.7 and 1.8 environments"

This reverts commit af5ddeb471.

jenkins.sh

@@ -8,9 +8,23 @@ rm -f test_results.xml
 test -d wcs || git clone http://git.entrouvert.org/wcs.git
 (cd wcs && git pull)
 
+export PIP_USE_WHEEL=no
+(pip freeze | grep -q Quixote) || pip install quixote
+(pip freeze | grep -q scgi) || pip install scgi
 pip install --upgrade 'pip<8'
-pip install --upgrade pylint==1.4.0 astroid==1.3.2 # 1.4.1 is buggy
+pip install --upgrade pylint pylint-django
+pip install --upgrade -r requirements.txt
+pip install --upgrade pytest pytest-django pytest-cov WebTest django-webtest
+pip install --upgrade 'django>=1.7, <1.8'
+pip install --no-deps --upgrade 'git+http://repos.entrouvert.org/cmsplugin-blurp.git/#egg=django-cmsplugin-blurp' # use blurp from git/master for now
+pip install --upgrade XStatic-ChartNew.js
+pip install --upgrade mock
 
-tox -r
+WCSCTL=$(pwd)/wcs/wcsctl.py \
+	DJANGO_SETTINGS_MODULE=combo.settings \
+	COMBO_SETTINGS_FILE=tests/settings.py \
+	py.test --junitxml=test_results.xml --cov-report xml --cov=combo/ --cov-config .coveragerc tests/
+
+test -f pylint.out && cp pylint.out pylint.out.prev
 (pylint -f parseable --rcfile /var/lib/jenkins/pylint.django.rc combo | tee pylint.out) || /bin/true
 test -f pylint.out.prev && (diff pylint.out.prev pylint.out | grep '^[><]' | grep .py) || /bin/true

setup.py

@@ -103,7 +103,7 @@ setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
     ],
-    install_requires=['django<1.9',
+    install_requires=['django>=1.7, <1.8',
         'django-ckeditor<4.5.3',
         'gadjo',
         'django-cmsplugin-blurp',

tox.ini

@@ -1,26 +0,0 @@
-[tox]
-envlist = coverage-{django17,django18}
-
-[testenv]
-usedevelop =
-  coverage: True
-setenv =
-  WCSCTL=wcs/wcsctl.py
-  DJANGO_SETTINGS_MODULE=combo.settings
-  COMBO_SETTINGS_FILE=tests/settings.py
-  coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov=combo/ --cov-config .coveragerc
-deps =
-  django17: django>1.7,<1.8
-  django18: django>=1.8,<1.9
-  mock
-  pytest
-  pytest-django
-  pytest-cov
-  WebTest
-  django_webtest
-  quixote
-  scgi
-  pylint==1.4.0
-  astroid==1.3.2
-commands =
-  py.test {env:COVERAGE:} {posargs:tests/}