diff options
| author | John Szakmeister <john@szakmeister.net> | 2015-10-14 05:21:52 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2015-10-14 05:21:52 -0400 |
| commit | d6642085a87cece41edc3808749f68d7b9a5ecd9 (patch) | |
| tree | 9af2f29627e1c5f06a32d2b206c3538090288d94 | |
| parent | 716d822d43db30195f795daa9fd71d54e682ec0c (diff) | |
| parent | cf2d1ade6b9d47a9ff4266fe4753eb0d0826ae1d (diff) | |
| download | nose-d6642085a87cece41edc3808749f68d7b9a5ecd9.tar.gz | |
Merge pull request #954 from benpatterson/benp/fix-travis-builds
[fix travis] Coverage 4.0 is available and is not supported in python 3.2
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index aa99cd3..bf3b8f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ # note that this is currently only used for travis-ci -coverage>=3.3 +coverage>=3.3; python_version < '3.2' +coverage>=3.3; python_version > '3.2' +coverage>=3.3,<4.0; python_version == '3.2' @@ -5,7 +5,9 @@ whitelist_externals= make [testenv] -deps= coverage >= 3.3 +deps= + py{26,27,31,33,34}: coverage >= 3.3 + py32: coverage >= 3.3, <4.0 commands= python selftest.py [] |