From 6c041111df4be23e73a898f4050b23eb9c945eb5 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 1 Aug 2016 18:20:53 -0500
Subject: [PATCH] Docs and CI: Work around dnspython Py2/3 idiocy

---
 doc/misc.rst        |  3 ++-
 run-tests-for-ci.sh | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/misc.rst b/doc/misc.rst
index dfa2557b..99fc8ab0 100644
--- a/doc/misc.rst
+++ b/doc/misc.rst
@@ -21,7 +21,8 @@ Enter the relate directory::
 
     cd relate
 
-Install the dependencies::
+Edit :file:`requirements.txt` to choose a version of `dnspython`, then install
+the dependencies::
 
     pip install -r requirements.txt
 
diff --git a/run-tests-for-ci.sh b/run-tests-for-ci.sh
index fb16dcd6..ab6ed9de 100644
--- a/run-tests-for-ci.sh
+++ b/run-tests-for-ci.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+set -e
+
 echo "-----------------------------------------------"
 echo "Current directory: $(pwd)"
 echo "Python executable: ${PY_EXE}"
@@ -54,7 +56,15 @@ export PATH=`pwd`/.env/local/bin:$PATH
 
 PIP="${PY_EXE} $(which pip)"
 
-$PIP install -r requirements.txt
+grep -v dnspython requirements.txt > req.txt
+if [[ "$PY_EXE" = "python2*" ]]; then
+  $PIP install dnspython
+else
+  $PIP install dnspython3
+fi
+
+$PIP install -r req.txt
+
 cp local_settings.py.example local_settings.py
 
 cd test
-- 
GitLab