From 86370fe045e3627461ab33809fa3e147b204c440 Mon Sep 17 00:00:00 2001 From: gujin Date: Tue, 4 Jun 2019 10:14:16 +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. remove the unnecessary "=" 3. Update some URLs to latest Change-Id: I94d8f5ef676a706e3ff8fabb188b264f20a024ae Closes-Bug: #1831522 --- HACKING.rst | 2 +- README.rst | 4 ++-- doc/source/readme.rst | 2 +- test-requirements.txt | 3 ++- watcher_tempest_plugin/README.rst | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index caba4c5..eea8b08 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,4 +1,4 @@ watcher-tempest-plugin Style Commandments -=============================================== +========================================= Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/ diff --git a/README.rst b/README.rst index 7fbb206..9fd0cc8 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -=============================== +====================== watcher-tempest-plugin -=============================== +====================== Description diff --git a/doc/source/readme.rst b/doc/source/readme.rst index a8e6214..c104138 100644 --- a/doc/source/readme.rst +++ b/doc/source/readme.rst @@ -101,7 +101,7 @@ For more information, please refer to: - Keystone connection: https://docs.openstack.org/tempest/latest/configuration.html#keystone-connection-info - Dynamic Keystone Credentials: https://docs.openstack.org/tempest/latest/configuration.html#dynamic-credentials -.. _virtual environment: http://docs.python-guide.org/en/latest/dev/virtualenvs/ +.. _virtual environment: https://docs.python-guide.org/dev/virtualenvs/ .. _Tempest configuration guide: https://docs.openstack.org/tempest/latest/configuration.html diff --git a/test-requirements.txt b/test-requirements.txt index 5e13e91..5969f5e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,8 @@ hacking<0.13,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 doc8>=0.6.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 diff --git a/watcher_tempest_plugin/README.rst b/watcher_tempest_plugin/README.rst index 1fd805f..7134e97 100644 --- a/watcher_tempest_plugin/README.rst +++ b/watcher_tempest_plugin/README.rst @@ -115,8 +115,8 @@ For more information, please refer to: - Keystone connection: https://docs.openstack.org/tempest/latest/configuration.html#keystone-connection-info - Dynamic Keystone Credentials: https://docs.openstack.org/tempest/latest/configuration.html#dynamic-credentials -.. _virtual environment: http://docs.python-guide.org/en/latest/dev/virtualenvs/ -.. _Tempest configuration guide: http://docs.openstack.org/tempest/latest/configuration.html +.. _virtual environment: https://docs.python-guide.org/dev/virtualenvs/ +.. _Tempest configuration guide: https://docs.openstack.org/tempest/latest/configuration.html Watcher Tempest tests execution