From 169f2a6b882afe8ad1ef44ed8de037c0e95747f8 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 13:02:53 +0200
Subject: [PATCH 1/5] Added tox.ini for testing with tox

see #5
---
 tox.ini | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 tox.ini

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..09f70f4
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist = py27,py35
+[testenv]
+deps=nose
+commands=nosetests

From 3d21eade4830e2e21e464186c8831b8ff60c08cb Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 13:05:19 +0200
Subject: [PATCH 2/5] Tox testing on Travis with tox-travis

---
 .travis.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77bc1e5..1247334 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,8 @@
+sudo: false
 language: python
 python:
-#  - "2.6"  # 2.6 does not have collections.OrderedDict
   - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
   - "3.5"
-  - "3.5-dev" # 3.5 development branch
-  - "3.6"
-  - "3.6-dev" # 3.6 development branch
-  - "3.7-dev" # 3.7 development branch
-  - "nightly" # currently points to 3.7-dev
-# command to install dependencies
-install: "pip install -r requirements.txt"
-install: "pip install nose"
-install: "sh get_testdata.sh"
-# command to run tests
-script: nosetests
+install: pip install tox-travis
+install: sh get_testdata.sh
+script: tox

From 49bfcb75eb8e49dbefbfe16bd6a6c6b3a1320bc5 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 13:08:06 +0200
Subject: [PATCH 3/5] Proper syntax for two install commands

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1247334..9e6a506 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 python:
   - "2.7"
   - "3.5"
-install: pip install tox-travis
-install: sh get_testdata.sh
+install:
+  - pip install tox-travis
+  - sh get_testdata.sh
 script: tox

From 760bf30b1a18f7c42b3d83d0d9b96fe572672e85 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 13:17:06 +0200
Subject: [PATCH 4/5] Add caching to the .travis.yml file

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9e6a506..a3627fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 sudo: false
 language: python
+cache:
+  directories:
+    - .tox
+    - tests/testdata
 python:
   - "2.7"
   - "3.5"

From 791cb8987e07b83df5808f546ba12fbc3d3c3ec3 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 13:27:55 +0200
Subject: [PATCH 5/5] In get_testdata.sh, don't download files that have
 already been downloaded

---
 get_testdata.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get_testdata.sh b/get_testdata.sh
index e04d9a4..639930e 100755
--- a/get_testdata.sh
+++ b/get_testdata.sh
@@ -6,7 +6,7 @@
 mkdir -p tests/testdata
 cd tests/testdata
 
-/usr/bin/wget -i - <<END_FILELIST
+/usr/bin/wget --continue -i - <<END_FILELIST
 http://files.figshare.com/1778905/arbin1.res
 http://files.figshare.com/1778937/bio_logic2.mpt
 http://files.figshare.com/1778938/bio_logic5.mpt