diff --git a/.zuul.yaml b/.zuul.yaml index e20a91a..e434d15 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,5 @@ - project: templates: - check-requirements - - openstack-lower-constraints-jobs - - openstack-python3-wallaby-jobs + - openstack-python3-jobs - publish-openstack-docs-pti diff --git a/doc/source/conf.py b/doc/source/conf.py index 764df86..1745f8e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -65,7 +65,7 @@ copyright = 'OpenStack Foundation' # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 37b8138..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,6 +0,0 @@ -boto==2.32.1 -pbr==2.0.0 -psutil==1.1.1 -six==1.9.0 -stestr==2.0.0 -testtools==0.9.34 diff --git a/requirements.txt b/requirements.txt index 58e361b..6e25b63 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,7 @@ +# Requirements lower bounds listed here are our best effort to keep them up to +# date but we do not test them so no guarantee of having them all correct. If +# you find any incorrect lower bounds, let us know or propose a fix. + pbr!=2.1.0,>=2.0.0 boto>=2.32.1 psutil>=1.1.1 diff --git a/tox.ini b/tox.ini index fb1208a..8f10fa6 100644 --- a/tox.ini +++ b/tox.ini @@ -5,9 +5,10 @@ ignore_basepython_conflict = true [testenv] basepython = python3 setenv = VIRTUAL_ENV={envdir} -deps =-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:pep8] @@ -32,11 +33,7 @@ show-source = true exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools [testenv:docs] -deps = -r{toxinidir}/doc/requirements.txt -commands = sphinx-build -W -b html doc/source doc/build/html - -[testenv:lower-constraints] deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt +commands = sphinx-build -W -b html doc/source doc/build/html