From be09a650293e066a2fdd79100f79b4ef9d600f26 Mon Sep 17 00:00:00 2001 From: Ilya Shakhat Date: Wed, 14 Dec 2016 12:51:10 +0400 Subject: [PATCH] Fix docs gate and rtd build Docs gate was broken due to https://sourceforge.net/p/docutils/bugs/301/ Change-Id: Icdf97e9547da6df0a9b12e1c61413de6690b3ac3 --- readthedocs.yml | 4 ++++ rtd-requirements.txt | 2 ++ test-requirements.txt | 2 +- tox.ini | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 readthedocs.yml create mode 100644 rtd-requirements.txt diff --git a/readthedocs.yml b/readthedocs.yml new file mode 100644 index 0000000..e6ef9a9 --- /dev/null +++ b/readthedocs.yml @@ -0,0 +1,4 @@ +python: + setup_py_install: true + +requirements_file: rtd-requirements.txt diff --git a/rtd-requirements.txt b/rtd-requirements.txt new file mode 100644 index 0000000..9463811 --- /dev/null +++ b/rtd-requirements.txt @@ -0,0 +1,2 @@ +-r requirements.txt +-r test-requirements.txt diff --git a/test-requirements.txt b/test-requirements.txt index a339e79..20a467c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,7 @@ coverage>=3.6 # Apache-2.0 hacking<0.11,>=0.10 mock>=1.2 # BSD oslotest>=1.10.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +sphinx>=1.5.1 # BSD -- to avoid https://sourceforge.net/p/docutils/bugs/301/ sphinxcontrib-httpdomain # BSD sphinx_rtd_theme testrepository>=0.0.18 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index 8dec78c..7e0913a 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,6 @@ commands = python tools/build_scenario_catalog.py doc/source/catalog.rst [testenv:docs] -deps = -r{toxinidir}/doc-requirements.txt commands = python setup.py build_sphinx [testenv:svg2png]