From 962f7a465d16f9c46ed5caae4631feab4e060fdf Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 3 May 2020 16:08:15 +0200 Subject: [PATCH] Small cleanups A few cleanups: * remove docs environment, this repo has not docs * Cleanup setup.cfg, remove obsolete sections * Update docs requirements to newer versions working properly with python3, releasenotes are build using python3 Change-Id: I721b81e422501b841107d4d2d96458759448a326 --- setup.cfg | 12 ------------ test-requirements.txt | 6 +++--- tox.ini | 5 ----- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/setup.cfg b/setup.cfg index 26d1371c6..2367de5cd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,15 +14,6 @@ classifier = Intended Audience :: Information Technology Topic :: Utilities -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source - -[global] -setup-hooks = - pbr.hooks.setup_hook - [files] data_files = config = config/* @@ -30,9 +21,6 @@ data_files = vars = vars/* usr/local/share/ansible/roles = roles/* -[wheel] -universal = 1 - [pbr] skip_authors = True skip_changelog = True diff --git a/test-requirements.txt b/test-requirements.txt index 2a07585cd..96c58529d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,5 @@ -openstackdocstheme>=1.11.0 # Apache-2.0 +openstackdocstheme>=2.0.0 # Apache-2.0 -sphinx>=1.6.2 # BSD -reno>=1.8.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +reno>=2.5.0 # Apache-2.0 jinja2 diff --git a/tox.ini b/tox.ini index 304bc660b..e2ca1680b 100644 --- a/tox.ini +++ b/tox.ini @@ -28,11 +28,6 @@ basepython = python3 deps = bindep commands = bindep test -[testenv:docs] -basepython = python3 -commands = python setup.py build_sphinx - - [testenv:releasenotes] basepython = python3 whitelist_externals = bash