From 7234780bae671b5fead73c00ff4d76221768ccd6 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Thu, 20 Jun 2019 00:16:24 +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: I5fe3be557f9bc3cc1f8faae198df93ed4ed2bc97 --- README.rst | 6 +++--- setup.cfg | 2 +- test-requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 1d3fdb6..72084be 100644 --- a/README.rst +++ b/README.rst @@ -11,9 +11,9 @@ Team and repository tags os-apply-config =============== ------------------------------------------------ +---------------------------------------------- Apply configuration from cloud metadata (JSON) ------------------------------------------------ +---------------------------------------------- What does it do? ================ @@ -79,7 +79,7 @@ example:: +-- mysql +-- mysql.conf -An example tree can be found `here `_. +An example tree can be found `here `_. If a template is executable it will be treated as an *executable template*. Otherwise, it will be treated as a *mustache template*. diff --git a/setup.cfg b/setup.cfg index d2544bf..69ab93b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ author-email = openstack-discuss@lists.openstack.org summary = Config files from cloud metadata description-file = README.rst -home-page = http://opendev.org/openstack/os-apply-config +home-page = https://opendev.org/openstack/os-apply-config classifier = Development Status :: 4 - Beta Environment :: Console diff --git a/test-requirements.txt b/test-requirements.txt index 08ad3cb..4e12ba2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,8 @@ coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0.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 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT