From 6dae687b0dc44d00dfd78f82090250a76914c5f0 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Thu, 6 Jun 2019 10:32:51 -0500 Subject: [PATCH] Drop references to oslosphinx Change-Id: Ibb8b14ac8c7f3c56958415c3022de31efef12d52 Signed-off-by: Sean McGinnis --- doc/requirements.txt | 1 - openstack_releases/requirements.py | 5 ++--- setup.cfg | 7 ------- tox.ini | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index e279abb9ed..6b641b70c9 100644 --- a/doc/requirements.txt +++ b/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 diff --git a/openstack_releases/requirements.py b/openstack_releases/requirements.py index addb76b241..8372a4632e 100644 --- a/openstack_releases/requirements.py +++ b/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 diff --git a/setup.cfg b/setup.cfg index f8530cfff5..d5063e6fbb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,13 +42,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 diff --git a/tox.ini b/tox.ini index 727241f40f..af0c0328bf 100644 --- a/tox.ini +++ b/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]