diff options
| author | Doug Hellmann <doug.hellmann@dreamhost.com> | 2014-06-15 10:43:51 -0400 |
|---|---|---|
| committer | Doug Hellmann <doug.hellmann@dreamhost.com> | 2014-06-15 10:52:11 -0400 |
| commit | d39ef75e58899db444a557494aefce065fe047fb (patch) | |
| tree | 6b700fed748bbc79038edda64e723c2f02d988ab | |
| parent | 65fc0d2a364fff791448404acad8a17bd4642a5f (diff) | |
| download | stevedore-d39ef75e58899db444a557494aefce065fe047fb.tar.gz | |
Fix requirement handling in tox
Move all test dependencies to test-requirements.txt and update
tox.ini to use that and the main requirements file to build the
virtualenv for testing. Remove redundant references to the different
requirements lists in other tox environment stanzas.
Change-Id: I1ff094778369ebfed567ebbb433ef487066f042a
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 4e214ef..4dda7a6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,5 @@ Pillow==2.4.0 # MIT sphinx>=1.1.2,!=1.2.0,<1.3 +nose +mock>=1.0 +coverage>=3.6 @@ -2,17 +2,15 @@ envlist = py26,py27,py32,py33,pypy,pep8,docs [testenv] +deps = + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt # tox passes --pre to pip by default, but we don't want that install_command = pip install {opts} {packages} distribute = False commands = nosetests -d --with-coverage --cover-inclusive --cover-package stevedore [] -deps = - nose - mock - coverage [testenv:venv] -deps = -r{toxinidir}/test-requirements.txt commands = {posargs} [testenv:pep8] @@ -20,5 +18,4 @@ deps = flake8 commands = flake8 stevedore setup.py [testenv:docs] -deps = -r{toxinidir}/docs/requirements.txt commands = python setup.py build_sphinx |