summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Dennis <rdennis@gmail.com>2014-03-03 22:36:03 -0500
committerRob Dennis <rdennis@gmail.com>2014-03-03 22:36:03 -0500
commit4dfffeb28da21a283adee01bb561b039c52ad27b (patch)
treebf353f6e1ff7d8113551f3d84598e2b4bc104450
parent5b5caf2111641b799b77772ab918675537d513cc (diff)
parentc0b6f9ec5ee19154618323d09527184c5f20f9da (diff)
downloadconfigobj-git-4dfffeb28da21a283adee01bb561b039c52ad27b.tar.gz
Merge pull request #37 from robdennis/master
fixes #35 - python-coveralls should only be installed in travis
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini1
2 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index a01d26a..f2b878a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ env:
- TOX_ENV=py26
install:
- pip install tox
- - pip install coveralls
+ - pip install python-coveralls
script:
- tox -e $TOX_ENV
after_success:
diff --git a/tox.ini b/tox.ini
index 0e7967d..0453810 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ envlist = py26,py27,py32,py33
[testenv]
deps=pytest
pytest-cov
- python-coveralls
setenv =
PYTHONWARNINGS = always
commands=python test_configobj.py