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: I5fe3be557f9bc3cc1f8faae198df93ed4ed2bc97
This commit is contained in:
jacky06 2019-06-20 00:16:24 +08:00
parent 75d527ab8f
commit 7234780bae
3 changed files with 6 additions and 5 deletions

View File

@ -11,9 +11,9 @@ Team and repository tags
os-apply-config os-apply-config
=============== ===============
----------------------------------------------- ----------------------------------------------
Apply configuration from cloud metadata (JSON) Apply configuration from cloud metadata (JSON)
----------------------------------------------- ----------------------------------------------
What does it do? What does it do?
================ ================
@ -79,7 +79,7 @@ example::
+-- mysql +-- mysql
+-- mysql.conf +-- mysql.conf
An example tree can be found `here <http://git.openstack.org/cgit/openstack/tripleo-image-elements/tree/elements/keystone/os-apply-config>`_. An example tree can be found `here <https://opendev.org/openstack/tripleo-image-elements/src/branch/master/elements/os-apply-config>`_.
If a template is executable it will be treated as an *executable If a template is executable it will be treated as an *executable
template*. Otherwise, it will be treated as a *mustache template*. template*. Otherwise, it will be treated as a *mustache template*.

View File

@ -5,7 +5,7 @@ author-email = openstack-discuss@lists.openstack.org
summary = Config files from cloud metadata summary = Config files from cloud metadata
description-file = description-file =
README.rst README.rst
home-page = http://opendev.org/openstack/os-apply-config home-page = https://opendev.org/openstack/os-apply-config
classifier = classifier =
Development Status :: 4 - Beta Development Status :: 4 - Beta
Environment :: Console Environment :: Console

View File

@ -7,7 +7,8 @@ coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT