Merge branch 'travis-fix'

.travis.yml

@@ -33,17 +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 big packages (they are cached to minimize build time)
+  # Install tox first, before dependencies (to get per-env deps)
+  - pip install tox
+  # 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 pandas
-  # Coverage install
-  # - pip install tox 'coverage<4' coveralls
-  - pip install tox 'coverage<4'
+  # - pip install numpy
+  # - pip install pandas
   # install this package (tqdm) into the environment
   - python setup.py install
 

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
@@ -13,10 +13,45 @@ 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
 
+[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 = {[testenv:pypy]passenv}
+deps =
+    {[testenv:pypy]deps}
+commands =
+    {[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
 commands =