From 2585b12b879bae4c3fe48a846d1ba9d3de1e4b77 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 12 Apr 2020 18:49:57 +0200 Subject: [PATCH] Cleanup py27 support This repo is now testing only with Python 3, so let's make a few cleanups: - Update requirements, no need for python_version anymore - Use newer openstackdocstheme version - Remove install_command from tox.ini, the default is fine Change-Id: Ib57fed37abe408b047b1ec364aea945ad06d75a5 --- doc/requirements.txt | 5 ++--- tox.ini | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 38ece2d4..1189e351 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD sphinx-testing # BSD -openstackdocstheme>=1.19.0 # Apache-2.0 +openstackdocstheme>=1.31.2 # Apache-2.0 diff --git a/tox.ini b/tox.ini index b320f16f..d36c2c78 100644 --- a/tox.ini +++ b/tox.ini @@ -14,8 +14,6 @@ whitelist_externals = mkdir rm sed -install_command = - pip install -U --force-reinstall {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./training-labs/tests/