From 8ab0e9796c5b5fbf6a5b20d9388213618e67dc76 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Tue, 18 Jun 2019 22:45:50 +0800 Subject: [PATCH] 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 --- CONTRIBUTING.rst | 4 ++-- HACKING.rst | 3 +-- README.rst | 4 ++-- test-requirements.txt | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0ce69d10..3f8fc0de 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 7faf92fd..befe517a 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 d7ab3a13..f42d0eb4 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 af895922..f53437e6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,8 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 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