Merge c476c4f into 9386fcb

.travis.yml

@@ -1,16 +1,18 @@
 sudo: false
 language: python
-python: 2.7
+python: 3.4
 env:
-- TOXENV=py26
-- TOXENV=py27
-- TOXENV=py32
-- TOXENV=py33
-- TOXENV=py34
-- TOXENV=pypy
-- TOXENV=pypy3
-- TOXENV=flake8
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py32
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=pypy
+  - TOXENV=pypy3
+  - TOXENV=flake8
 install:
-- pip install tox
+  - pip install tox coveralls
 script:
-- tox
+  - tox
+after_success:
+  - coveralls

tox.ini

@@ -7,13 +7,14 @@
 envlist = py26, py27, py32, py33, py34, pypy, pypy3, flake8
 
 [testenv]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
     nose
     coverage
-    python-coveralls
-commands = nosetests --with-coverage --cover-package=tqdm -v tqdm/
-after_success:
-  - coveralls
+    coveralls
+commands =
+    nosetests --with-coverage --cover-package=tqdm -v tqdm/
+    coveralls
 
 [testenv:flake8]
 basepython = python2.7