diff options
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 10 |
4 files changed, 4 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt index a19cb0e..40dfd57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -oslo.config>=2.6.0 # Apache-2.0 +oslo.config>=2.7.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 pytz>=2013.6 six>=1.9.0 @@ -14,7 +14,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: OS Independent Programming Language :: Python - Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 diff --git a/test-requirements.txt b/test-requirements.txt index d49fa6b..7d1893f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,5 +13,5 @@ testrepository>=0.0.18 testtools>=1.4.0 # this is required for the docs build jobs -oslosphinx>=2.5.0 # Apache-2.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 @@ -1,14 +1,9 @@ [tox] minversion = 1.6 -skipsdist = True -envlist = py26,py27,py33,py34,pep8 +envlist = py27,py33,py34,pep8 [testenv] -setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt -install_command = pip install -U {opts} {packages} -usedevelop = True +deps = -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] @@ -18,7 +13,6 @@ commands = flake8 commands = python setup.py build_sphinx [testenv:cover] -setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --coverage [testenv:venv] |