summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-20 10:10:06 +0000
committerGerrit Code Review <review@openstack.org>2017-12-20 10:10:06 +0000
commit35c5654d887b0204872215fdcb28c212419b5f5a (patch)
treecbda6d0e99fb5d14c8097e084d48910c05209d26
parent0a282f5430ac50f1f8104634487f67ed46bec23f (diff)
parent3016f08782c7b37b6ea3b4597b3bc7ab94c73dac (diff)
downloadpython-keystoneclient-35c5654d887b0204872215fdcb28c212419b5f5a.tar.gz
Merge "Create doc/requirements.txt"
-rw-r--r--doc/requirements.txt10
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini5
3 files changed, 13 insertions, 5 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..cf805c1
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,10 @@
+# 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.
+
+# These are needed for docs generation
+openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
+reno>=2.5.0 # Apache-2.0
+lxml!=3.7.0,>=3.4.1 # BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 0e2b0bc..1209646 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,11 +11,8 @@ keyring>=5.5.1 # MIT/PSF
lxml!=3.7.0,>=3.4.1 # BSD
mock>=2.0.0 # BSD
oauthlib>=0.6.0 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
requests-mock>=1.1.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
tempest>=17.1.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testresources>=2.0.0 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index df31ecc..8233748 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,11 +55,12 @@ show-source = True
exclude = .venv,.tox,dist,doc,*egg,build
[testenv:docs]
-commands=
- python setup.py build_sphinx
+commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
[testenv:releasenotes]
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+deps = -r{toxinidir}/doc/requirements.txt
[hacking]
import_exceptions =