Merge "Follow PTI for docs builds"

doc/source/conf.py

@@ -80,7 +80,7 @@ html_theme = 'openstackdocs'
 # 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']
 
 
 # -- Options for HTMLHelp output ------------------------------------------

lower-constraints.txt

@@ -61,7 +61,6 @@ oslo.log==3.36.0
 oslo.policy==1.44.1
 oslo.serialization==2.18.0
 oslo.utils==3.34.0
-oslosphinx==4.7.0
 osprofiler==2.3.0
 packaging==20.3
 pbr==2.0.0

setup.cfg

@@ -21,8 +21,3 @@ classifier =
 [files]
 packages =
     adjutant_ui
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source

test-requirements.txt

@@ -10,7 +10,6 @@
 hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
 coverage>=4.0 # Apache-2.0
 nodeenv>=0.9.4 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
 reno>=1.8.0 # Apache-2.0
 selenium>=2.50.1 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD

tox.ini

@@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
          DJANGO_SETTINGS_MODULE=adjutant_ui.test.settings
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps =  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python manage.py test {posargs}
@@ -47,7 +47,8 @@ commands =
   npm run {posargs:test}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:lower-constraints]
 deps =