Sync Sphinx requirement
1. Sync sphinx dependency with global requirements. It caps python 2 since
sphinx 2.0 no longer supports Python 2.7.
2. Update some URLs to latest
3. Remove unncessary "=="
Change-Id: Iff24e8d5082d8ef8dc2d29ea92288bf418f5500d
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 0ce69d1..3f8fc0d 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,14 +1,14 @@
If you would like to contribute to the development of OpenStack, you must
follow the steps in this page:
- http://docs.openstack.org/infra/manual/developers.html
+ https://docs.openstack.org/infra/manual/developers.html
If you already have a good understanding of how the system works and your
OpenStack accounts are set up, you can skip to the development workflow
section of this documentation to learn how changes to OpenStack should be
submitted for review via the Gerrit tool:
- http://docs.openstack.org/infra/manual/developers.html#development-workflow
+ https://docs.openstack.org/infra/manual/developers.html#development-workflow
Pull requests submitted through GitHub will be ignored.
diff --git a/HACKING.rst b/HACKING.rst
index 7faf92f..befe517 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,5 +1,4 @@
Openstack Style Commandments
-
-===============================================
+============================
Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/README.rst b/README.rst
index d7ab3a1..f42d0eb 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
-===============================================
+==============================
Tempest Integration for Cinder
-===============================================
+==============================
This directory contains additional Cinder tempest tests.
diff --git a/test-requirements.txt b/test-requirements.txt
index af89592..f53437e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,8 @@
coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+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,>=1.6.2;python_version>='3.4' # BSD
oslotest>=3.2.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT