From ce998332eaae68b0df03d7c0bb44a6831e21bd63 Mon Sep 17 00:00:00 2001
From: Stephen L <lrq3000@gmail.com>
Date: Mon, 31 Oct 2016 00:04:33 +0100
Subject: [PATCH 1/3] Travis dependencies to fix pandas

---
 .travis.yml | 11 +++++++----
 tox.ini     |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8b9a2d5..ae0f4c9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,13 +37,16 @@ before_install:
   - pip install codecov
 
 install:
-  # install big packages (they are cached to minimize build time)
+  # Install tox first, before dependencies (to get per-env deps)
+  - pip install tox
+  # Coverage install
+  # - pip install 'coverage<4' coveralls
+  - pip install 'coverage<4'
+  # Install big packages (they are cached to minimize build time)
   # if issues, clear cache
   # https://docs.travis-ci.com/user/caching/#Clearing-Caches
+  - pip install numpy
   - pip install pandas
-  # Coverage install
-  # - pip install tox 'coverage<4' coveralls
-  - pip install tox 'coverage<4'
   # install this package (tqdm) into the environment
   - python setup.py install
 
diff --git a/tox.ini b/tox.ini
index f515b48d..11b6a485 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,9 @@ deps =
     nose-timer
     coverage<4
     coveralls
+    cython
+    numpy
+    pandas
 commands =
     nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_perf\.py" -d -v tqdm/
     - coveralls

From afe05c7e417937e0c80d80188ad79695e524d895 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <tqdm@caspersci.uk.to>
Date: Mon, 31 Oct 2016 14:40:33 +0000
Subject: [PATCH 2/3] travisty

- fix travis v tox installs
- put py26, py33 first since they don't cache
---
 .travis.yml | 10 ++++------
 tox.ini     | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae0f4c9c..555b7047 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,20 +33,18 @@ before_install:
   # fix a crash with multiprocessing on Travis
   - sudo rm -rf /dev/shm
   - sudo ln -s /run/shm /dev/shm
-  # install codecov
+  # coverage submission packages
   - pip install codecov
+  # - pip install coveralls
 
 install:
   # Install tox first, before dependencies (to get per-env deps)
   - pip install tox
-  # Coverage install
-  # - pip install 'coverage<4' coveralls
-  - pip install 'coverage<4'
   # Install big packages (they are cached to minimize build time)
   # if issues, clear cache
   # https://docs.travis-ci.com/user/caching/#Clearing-Caches
-  - pip install numpy
-  - pip install pandas
+  # - pip install numpy
+  # - pip install pandas
   # install this package (tqdm) into the environment
   - python setup.py install
 
diff --git a/tox.ini b/tox.ini
index 11b6a485..c7e2c19b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, py34, py35, pypy, pypy3, flake8, setup.py, perf
+envlist = py26, py33, py32, py34, py27, py35, pypy, pypy3, flake8, setup.py, perf
 
 [testenv]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
@@ -20,6 +20,29 @@ commands =
     nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_perf\.py" -d -v tqdm/
     - coveralls
 
+[testenv:pypy]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+deps =
+    nose
+    nose-timer
+    coverage<4
+    coveralls
+commands =
+    nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_p(erf|andas)\.py" -d -v tqdm/
+    - coveralls
+
+[testenv:pypy3]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+deps =
+    nose
+    nose-timer
+    coverage<4
+    coveralls
+commands =
+    nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_p(erf|andas)\.py" -d -v tqdm/
+    - coveralls
+
+
 [testenv:flake8]
 deps = flake8
 commands =

From 8ea5ca13f072a7d27a2eb9fe3c9fbed1a6cf3c8a Mon Sep 17 00:00:00 2001
From: Stephen L <lrq3000@gmail.com>
Date: Mon, 31 Oct 2016 23:57:59 +0100
Subject: [PATCH 3/3] Skip pandas on py26,33; reduce duplication

---
 tox.ini | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index c7e2c19b..1050a174 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,16 +32,25 @@ commands =
     - coveralls
 
 [testenv:pypy3]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+passenv = {[testenv:pypy]passenv}
 deps =
-    nose
-    nose-timer
-    coverage<4
-    coveralls
+    {[testenv:pypy]deps}
 commands =
-    nosetests --with-coverage --with-timer --cover-package=tqdm --ignore-files="tests_p(erf|andas)\.py" -d -v tqdm/
-    - coveralls
+    {[testenv:pypy]commands}
 
+[testenv:py26]
+passenv = {[testenv:pypy]passenv}
+deps =
+    {[testenv:pypy]deps}
+commands =
+    {[testenv:pypy]commands}
+
+[testenv:py33]
+passenv = {[testenv:pypy]passenv}
+deps =
+    {[testenv:pypy]deps}
+commands =
+    {[testenv:pypy]commands}
 
 [testenv:flake8]
 deps = flake8