From 257bda715d946582835b181bc4ad3733daf85eb8 Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Thu, 29 Aug 2019 01:54:33 +0200 Subject: [PATCH] doc generation improvements - move sphinx requirements to doc/requirements.txt and use A. Jaeger's suggestion from https://review.opendev.org/#/c/663866/ - put back py version for tox.ini Change-Id: I3619b7960fbd1dd87aea5b9e16b322f25499069c --- doc/requirements.txt | 2 ++ requirements.txt | 2 -- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000..782c30e --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,2 @@ +sphinx>=1.2.3,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD diff --git a/requirements.txt b/requirements.txt index 2abe9b9..64a82ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,6 @@ pbr>=0.8 tortilla>=0.4.1 Jinja2>=2.7.3 -Sphinx>=1.2.3,<2.0; python_version < '3' -Sphinx>=1.2.3; python_version >= '3' docopt>=0.6.2 simplejson>=3.8.1 requests>=2.9.1 diff --git a/tox.ini b/tox.ini index c73e639..63ab293 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py36,py35,docs +envlist = py37,py36,py35,py27,docs skipsdist = True [testenv]