From ffb3a3f0ee44df125bc5e9cd08514422a10b02df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sat, 30 Dec 2017 23:32:31 +0100
Subject: [PATCH] update tox for django 1.11 and correct dependencies

---
 getlasso.sh | 20 ++++++++++++++++++++
 tox.ini     |  9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 getlasso.sh

diff --git a/getlasso.sh b/getlasso.sh
new file mode 100755
index 000000000..680da393e
--- /dev/null
+++ b/getlasso.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Get venv site-packages path
+DSTDIR=`python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
+
+# Get not venv site-packages path
+# Remove first path (assuming that is the venv path)
+NONPATH=`echo $PATH | sed 's/^[^:]*://'`
+SRCDIR=`PATH=$NONPATH python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
+
+# Clean up
+rm -f $DSTDIR/lasso.*
+rm -f $DSTDIR/_lasso.*
+
+# Link
+ln -sv $SRCDIR/lasso.py $DSTDIR
+ln -sv $SRCDIR/_lasso.* $DSTDIR
+
+exit 0
+
diff --git a/tox.ini b/tox.ini
index 0d39f2c7a..1e355f634 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,27 @@
 [tox]
+envlist = coverage-{django18,django111}-pylint-pg
 skipsdist = True
-envlist = pg
 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/wcs/
 
 [testenv]
 setenv =
     PYTHONPATH=.
+    DJANGO_SETTINGS_MODULE=wcs.settings
+    WCS_SETTINGS_FILE=tests/settings.py
     coverage: COVERAGE=--junit-xml=test_results.xml --cov=wcs --cov-report xml --cov-config .coveragerc
 passenv =
     USER
 deps =
+    django18: django>=1.8,<1.9
+    django111: django>=1.11,<1.12
     pytest>=3.3.0
     pytest-mock
     pytest-cov
     WebTest
     psycopg2
     mechanize
+    gadjo
+    requests
     scgi
     vobject
     pyquery
@@ -25,5 +31,6 @@ deps =
     pillow
     feedparser
 commands =
+    ./getlasso.sh
     pickle:  py.test --without-postgresql-tests {env:COVERAGE:} {posargs:tests}
     pg:  py.test {env:COVERAGE:} {posargs:tests}