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
This commit is contained in:
Bruno Cornec 2019-08-29 01:54:33 +02:00
parent 72bb353f00
commit 257bda715d
3 changed files with 3 additions and 3 deletions

2
doc/requirements.txt Normal file
View File

@ -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

View File

@ -5,8 +5,6 @@
pbr>=0.8 pbr>=0.8
tortilla>=0.4.1 tortilla>=0.4.1
Jinja2>=2.7.3 Jinja2>=2.7.3
Sphinx>=1.2.3,<2.0; python_version < '3'
Sphinx>=1.2.3; python_version >= '3'
docopt>=0.6.2 docopt>=0.6.2
simplejson>=3.8.1 simplejson>=3.8.1
requests>=2.9.1 requests>=2.9.1

View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 2.0 minversion = 2.0
envlist = py36,py35,docs envlist = py37,py36,py35,py27,docs
skipsdist = True skipsdist = True
[testenv] [testenv]