Use a separate doc requirements file

As per the OpenStack TC decision [1], the doc requirements should
be listed separately.

This also simplifies the requirements handling. At them moment,
we're facing some issues due to conflicting doc related lower
constraints.

[1] https://governance.openstack.org/tc/reference/project-testing-interface.html

Change-Id: Ifa2d545d1be6615bca1a85c471322c7e9a3da3b3

.docs-requirements.txt

@@ -1,23 +0,0 @@
-# As ``readthedocs`` will not use tox, we have to explicitly provide the doc
-# build requirements that are not included in requirements.txt.
-#
-# Unfortunately, we'll have to update this file manually at least once per
-# release.
-
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-# We'll have to make sure that the nova branch matches the compute-hyperv one.
--e git+http://github.com/openstack/nova.git#egg=nova
-
-hacking<0.13,>=0.12.0 # Apache-2.0
-
-coverage!=4.4,>=4.0 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
-oslo.config>=5.1.0 # Apache-2.0
-oslosphinx>=4.7.0  # Apache-2.0
-openstackdocstheme>=1.18.1 # Apache-2.0
-
-# releasenotes
-reno>=2.5.0 # Apache-2.0

doc/requirements.txt

@@ -0,0 +1,11 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+
+# releasenotes
+reno>=3.1.0 # Apache-2.0
+
+oslo.config>=5.2.0 # Apache-2.0

lower-constraints.txt

@@ -1,83 +1,30 @@
-alabaster==0.7.10
-appdirs==1.4.3
-Babel==2.3.4
-certifi==2018.1.18
-cffi==1.11.5
-chardet==3.0.4
-cliff==2.11.0
-cmd2==0.8.1
-coverage==4.0
-ddt==1.0.1
+ddt==1.2.1
 debtcollector==1.19.0
-docutils==0.14
-dulwich==0.19.0
-enum-compat==0.0.2
-eventlet==0.18.2
-extras==1.0.0
-fasteners==0.14.1
-fixtures==3.0.0
-greenlet==0.4.13
-idna==2.6
-imagesize==1.0.0
-iso8601==0.1.12
-Jinja2==2.10
-keystoneauth1==3.4.0
-linecache2==1.0.0
-MarkupSafe==1.0
-mccabe==0.2.1
+eventlet==0.22.0
 mock==3.0.0
-mox3==0.25.0
-msgpack==0.5.6
-netaddr==0.7.19
-netifaces==0.10.6
+netaddr==0.7.18
 openstackdocstheme==2.2.1
-os-brick==2.2.0
-os-client-config==1.29.0
+os-brick==3.1.0
 os-win==5.2.0
-oslo.concurrency==3.26.0
-oslo.config==5.2.0
-oslo.context==2.20.0
+oslo.concurrency==3.29.0
+oslo.config==6.8.0
+oslo.context==2.22.2
 oslo.i18n==3.15.3
 oslo.log==3.36.0
-oslo.privsep==1.28.0
-oslo.serialization==2.18.0
-oslo.service==1.24.0
-oslo.utils==3.33.0
-oslotest==3.2.0
-Paste==2.0.3
-PasteDeploy==1.5.2
+oslo.serialization==2.21.1
+oslo.service==1.40.1
+oslo.utils==4.7.0
+oslotest==3.8.0
 pbr==2.0.0
-prettytable==0.7.2
-pycparser==2.18
-Pygments==2.2.0
-pyinotify==0.9.6
-pyparsing==2.2.0
-pyperclip==1.6.0
 python-barbicanclient==4.5.2
-python-dateutil==2.7.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2018.3
-PyYAML==3.12
-reno==3.1.0
-repoze.lru==0.7
-requests==2.18.4
-requestsexceptions==1.4.0
-retrying==1.3.3
-rfc3986==1.1.0
-Routes==2.4.1
-six==1.11.0
-snowballstemmer==1.2.1
-Sphinx==2.0.0
-sphinxcontrib-websupport==1.0.1
-stestr==2.0.0
-stevedore==1.28.0
-testrepository==0.0.20
+python-subunit==1.4.0
+PyMI==1.0.0;sys_platform=='win32'
+six==1.12.0
+stestr===2.0.0
+stevedore==1.20.0
+testscenarios==0.4
 testtools==2.2.0
 tooz==1.58.0
-traceback2==1.4.0
-unittest2==1.1.0
-urllib3==1.22
-WebOb==1.7.4
-wrapt==1.10.11
-wsgi-intercept==1.4.1
+wmi==0.5;sys_platform=='win32'
+wrapt==1.7.0
+wsgi-intercept==1.7.0

requirements.txt

@@ -3,18 +3,17 @@
 # process, which may cause wedges in the gate later.
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
 
-os-brick>=2.2.0 # Apache-2.0
+os-brick>=3.1.0 # Apache-2.0
 os-win>=5.2.0 # Apache-2.0
-oslo.config>=5.2.0 # Apache-2.0
+oslo.config>=6.8.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
-oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
-oslo.utils>=3.33.0 # Apache-2.0
+oslo.serialization>=2.21.1 # Apache-2.0
+oslo.service>=1.40.1 # Apache-2.0
+oslo.utils>=4.7.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 
 tooz>=1.58.0 # Apache-2.0
 
-eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
+eventlet>=0.22.0 # MIT
 python-barbicanclient>=4.5.2 # Apache-2.0

test-requirements.txt

@@ -5,18 +5,12 @@
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
-ddt>=1.0.1 # MIT
+ddt>=1.2.1 # MIT
 mock>=3.0.0 # BSD
-python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx>=2.0.0,!=2.1.0 # BSD
-oslo.config>=5.2.0 # Apache-2.0
-oslotest>=3.2.0 # Apache-2.0
+python-subunit>=1.4.0 # Apache-2.0/BSD
+oslotest>=3.8.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-openstackdocstheme>=2.2.1 # Apache-2.0
 
 # placement functional tests
-wsgi-intercept>=1.4.1 # MIT License
-
-# releasenotes
-reno>=3.1.0 # Apache-2.0
+wsgi-intercept>=1.7.0 # MIT License

tox.ini

@@ -48,8 +48,7 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-deps =
-       -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/doc/requirements.txt
        -egit+https://github.com/openstack/nova#egg=nova
 commands =
   # We cannot use -W here since nova docs contain links to the nova tree