summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml4
-rw-r--r--tox.ini6
2 files changed, 8 insertions, 2 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 7badb0e..a389849 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -33,6 +33,10 @@
description: |
Run functional tests of python-swiftclient under Python 2
vars:
+ devstack_localrc:
+ # devstack dropped support for bionic, but we want it for easier py2 support.
+ # Set this so we install anyway.
+ FORCE: "yes"
tox_envlist: py2func
- project:
diff --git a/tox.ini b/tox.ini
index 10e7b8d..287a244 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,8 @@ commands = {[testenv:func]commands}
[testenv:docs]
basepython = python3
usedevelop = False
-deps = -r{toxinidir}/doc/requirements.txt
+deps = -c{env:TOX_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 -W
@@ -99,7 +100,8 @@ commands = bindep test
[testenv:releasenotes]
basepython = python3
usedevelop = False
-deps = -r{toxinidir}/doc/requirements.txt
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:pdf-docs]