Merge "Drop references to oslosphinx"

doc/requirements.txt

@@ -1,7 +1,6 @@
 # Packages required for building docs
 
 sphinx>=1.6.2  # BSD
-oslosphinx>=4.7.0  # Apache-2.0
 sphinxcontrib-datatemplates>=0.4.0  # BSD License
 icalendar>=3.10  # BSD
 whereto>=0.3.0  # Apache-2.0

openstack_releases/requirements.py

@@ -12,8 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""Tools for working with requirements lists.
-"""
+"""Tools for working with requirements lists."""
 
 import logging
 import os.path
@@ -129,7 +128,7 @@ def parse_requirements(body):
 
     [sphinxext]
     sphinx<1.6.1,>=1.5.1
-    oslosphinx
+    openstackdocstheme
     sphinxcontrib.datatemplates
     icalendar
 

setup.cfg

@@ -41,13 +41,6 @@ console_scripts =
     check-schema = openstack_releases.cmds.check_schema:main
     find-gerrit-acl-issues = openstack_releases.cmds.find_gerrit_acl_issues:main
 
-[extras]
-sphinxext =
-    sphinx>=1.5.1,<1.6.1
-    oslosphinx
-    sphinxcontrib.datatemplates
-    icalendar
-
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build

tox.ini

@@ -62,7 +62,6 @@ commands = python {toxinidir}/tools/aclmanager.py {posargs}
 commands = python {toxinidir}/tools/membership_freeze_test.py {posargs}
 
 [testenv:venv]
-deps = .[sphinxext]
 commands = {posargs}
 
 [testenv:history]