diff --git a/requirements.txt b/requirements.txt index 6a1194e..f0a3376 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,3 @@ pbr>=1.6 SQLAlchemy>=0.8.2 alembic>=0.4.1 oslo.config>=1.4.0.0a3 -Babel>=1.3,!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3 # BSD -stevedore>=1.3.0 -six>=1.5.2 diff --git a/test-requirements.txt b/test-requirements.txt index 59ea201..f28eee1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,3 +18,4 @@ psycopg2 os-testr reno>=0.1.1 # Apache2 oslo.concurrency>=3.5.0 +six>=1.5.2 diff --git a/tox.ini b/tox.ini index 66e4752..ab2090b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py35,py27,pypy,pep8 +envlist = py35,py27,pypy,pep8,pip-check-reqs skipsdist = True [testenv] @@ -46,3 +46,15 @@ show-source = True ignore = E123,E125,E129,H305,H402,E711 builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,releasenotes + + +[testenv:pip-check-reqs] +# Do not install test-requirements as that will pollute the virtualenv for +# determining missing packages. +# This also means that pip-check-reqs must be installed separately, outside +# of the requirements.txt files +deps = pip_check_reqs + -r{toxinidir}/requirements.txt +commands= + pip-extra-reqs -d --ignore-file=coverage2sql/tests/* coverage2sql + pip-missing-reqs -d --ignore-file=coverage2sql/tests/* coverage2sql