diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-22 03:25:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-22 03:25:30 +0000 |
| commit | 99dabdc4b1e25f825bd4ad43740b96790ca6dfc1 (patch) | |
| tree | cf9ad3e6266eb7a8236c291be0c2b35027af9ed3 | |
| parent | 06828ebbe38960111b37431e16a6ad7ee7dd8c87 (diff) | |
| parent | 6aeee95e2acf703a6e41b7172f2333e899038332 (diff) | |
| download | pbr-99dabdc4b1e25f825bd4ad43740b96790ca6dfc1.tar.gz | |
Merge "Fix python 3.3 tests"
| -rw-r--r-- | test-requirements-py3.txt | 10 | ||||
| -rw-r--r-- | tox.ini | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt deleted file mode 100644 index eba16b8..0000000 --- a/test-requirements-py3.txt +++ /dev/null @@ -1,10 +0,0 @@ -coverage>=3.6 -discover -fixtures>=0.3.12 -flake8 -python-subunit -sphinx>=1.1.2 --e bzr+lp:testrepository#egg=testrepository -testresources -testscenarios -testtools>=0.9.27 @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,pep8 +envlist = py26,py27,py33,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -11,10 +11,6 @@ deps = -r{toxinidir}/requirements.txt commands = python setup.py testr --testr-args='{posargs}' -[testenv:py33] -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements-py3.txt - [tox:jenkins] sitepackages = True downloadcache = ~/cache/pip |