From 85ec10224ba56206e217990a628a562cc26e6362 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 17 Apr 2020 17:01:28 +0200 Subject: [PATCH] Cleanup py27 support This repo is now testing only with Python 3, so let's make a few cleanups: - Remove obsolete sections from setup.cfg - Cleanup doc/source/conf.py to remove now obsolete content. - Use newer openstackdocstheme and Sphinx versions - Remove install_command from tox.ini, the default is fine Change-Id: I4980bac7a558a291963270de592078f1a3af1111 --- doc/requirements.txt | 6 +++--- doc/source/conf.py | 2 +- setup.cfg | 11 ----------- tox.ini | 1 - 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 2c58d6f..23fd8b4 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,4 @@ -pbr>=0.11 -openstackdocstheme -sphinx>=1.6.5 +pbr>=2.0,!=2.1 +openstackdocstheme>=2.0 +sphinx>=2.0 yasfb>=0.5.1 diff --git a/doc/source/conf.py b/doc/source/conf.py index 1667016..2d5fb92 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -24,7 +24,7 @@ extensions = [ # openstackdocstheme settings repository_name = 'openstack/constellations' -bug_project = '987' +use_storyboard = True version = '' release = '' diff --git a/setup.cfg b/setup.cfg index fe1ea27..0b5d30f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,14 +11,3 @@ classifier = Intended Audience :: Developers License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux - -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 - -[pbr] -warnerrors = True - -[upload_sphinx] -upload-dir = doc/build/html diff --git a/tox.ini b/tox.ini index 4b2822d..5e8519d 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,6 @@ skipsdist = True [testenv] usedevelop = True basepython = python3 -install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps =