From e215d3d26027d5d50d8993e7b4531bc9fa3f84a0 Mon Sep 17 00:00:00 2001 From: Brian Stajkowski Date: Tue, 27 Sep 2016 06:59:26 -0700 Subject: [PATCH] Remove Static Path Sphinx No static path is required as we don't have anything to move from a static directory. This will ensure the gate tests pass. Also, moved docs to doc as gate failure isn't looking at docs folder, and updated tox environment run. Change-Id: I2d6d7e42eafef8e052006a4938e7950279f2f60c Closes-Bug: #1628113 --- {docs => doc}/Makefile | 0 {docs => doc}/make.bat | 0 {docs => doc}/shared_ips.raml | 0 {docs => doc}/shared_ips_nova.raml | 0 {docs => doc}/source/INDEX.rst | 0 {docs => doc}/source/conf.py | 2 +- test-requirements.txt | 1 + tox.ini | 2 +- 8 files changed, 3 insertions(+), 2 deletions(-) rename {docs => doc}/Makefile (100%) rename {docs => doc}/make.bat (100%) rename {docs => doc}/shared_ips.raml (100%) rename {docs => doc}/shared_ips_nova.raml (100%) rename {docs => doc}/source/INDEX.rst (100%) rename {docs => doc}/source/conf.py (99%) diff --git a/docs/Makefile b/doc/Makefile similarity index 100% rename from docs/Makefile rename to doc/Makefile diff --git a/docs/make.bat b/doc/make.bat similarity index 100% rename from docs/make.bat rename to doc/make.bat diff --git a/docs/shared_ips.raml b/doc/shared_ips.raml similarity index 100% rename from docs/shared_ips.raml rename to doc/shared_ips.raml diff --git a/docs/shared_ips_nova.raml b/doc/shared_ips_nova.raml similarity index 100% rename from docs/shared_ips_nova.raml rename to doc/shared_ips_nova.raml diff --git a/docs/source/INDEX.rst b/doc/source/INDEX.rst similarity index 100% rename from docs/source/INDEX.rst rename to doc/source/INDEX.rst diff --git a/docs/source/conf.py b/doc/source/conf.py similarity index 99% rename from docs/source/conf.py rename to doc/source/conf.py index aa8a86d..e9aa004 100644 --- a/docs/source/conf.py +++ b/doc/source/conf.py @@ -127,7 +127,7 @@ html_theme = 'default' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +#html_static_path = ['_static'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied diff --git a/test-requirements.txt b/test-requirements.txt index 5e77299..0044422 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ hacking<0.11,>=0.10.0 # Packages needed for dev testing mock>=2.0 # BSD sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +oslosphinx>=4.7.0 # Apache-2.0 coverage>=3.6 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 62e5496..fcdac32 100644 --- a/tox.ini +++ b/tox.ini @@ -47,7 +47,7 @@ deps = -r{toxinidir}/requirements.txt commands = nosetests --exclude=mysql --cover-package=quark --cover-erase {posargs} [testenv:docs] -commands = sphinx-build -W -b html docs/source docs/build/html +commands = sphinx-build -W -b html doc/source doc/build/html [testenv:mysql] commands = nosetests --where=quark/tests/functional/mysql {posargs}