From 46d76c05827ea05f8b64a2abd492c1c29007901b Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Thu, 23 Oct 2014 17:25:45 +0300 Subject: [PATCH] Adding a patch to update /doc/source/conf.py and test-requirements.txt files to use oslo.sphinx instead oslosphinx Change-Id: Ife1033b9be5db096c085f028daea2e8dea007f10 --- .gitreview | 7 ++-- .../0013-Revert-Switch-to-oslo.sphinx.patch | 39 +++++++++++++++++++ rpm/SPECS/python-django-horizon.spec | 1 + 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch diff --git a/.gitreview b/.gitreview index 478a295..1bb0c6e 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,4 @@ [gerrit] -host=gerrit.mirantis.com -project=openstack-ci/openstack/horizon-build -defaultremote=gerrit-mirantis -defaultbranch=openstack-ci/fuel-5.0/2014.1 +host=review.fuel-infra.org +project=packages/centos6/python-django-openstack-auth +port=29418 diff --git a/rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch b/rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch new file mode 100644 index 0000000..f0574c0 --- /dev/null +++ b/rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch @@ -0,0 +1,39 @@ +From a33fc58c5bc848953c2298479a956047a95c6f58 Mon Sep 17 00:00:00 2001 +From: Maksym Yatsenko +Date: Thu, 23 Oct 2014 14:10:40 +0300 +Subject: [PATCH] Revert "Switch to oslo.sphinx" + +--- + doc/source/conf.py | 2 +- + test-requirements.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/source/conf.py b/doc/source/conf.py +index 2e00cc0..e912ce7 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -144,7 +144,7 @@ extensions = ['sphinx.ext.autodoc', + 'sphinx.ext.coverage', + 'sphinx.ext.pngmath', + 'sphinx.ext.viewcode', +- 'oslosphinx', ++ 'oslo.sphinx', + ] + + # Add any paths that contain templates here, relative to this directory. +diff --git a/test-requirements.txt b/test-requirements.txt +index 67ba616..01a6520 100644 +--- a/test-requirements.txt ++++ b/test-requirements.txt +@@ -8,7 +8,7 @@ nose-exclude + nosehtmloutput>=0.0.3 + nosexcover + openstack.nose_plugin>=0.7 +-oslosphinx ++oslo.sphinx + selenium + sphinx>=1.1.2,<1.1.999 + testtools>=0.9.34 +-- +1.9.1 + diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec index d30430d..b351cc6 100644 --- a/rpm/SPECS/python-django-horizon.spec +++ b/rpm/SPECS/python-django-horizon.spec @@ -35,6 +35,7 @@ Patch0009: 0009-fix-flake8-issues.patch Patch0010: 0010-remove-runtime-dep-to-python-pbr.patch Patch0011: 0011-Add-Change-password-link-to-the-RCUE-theme.patch Patch0012: 0012-Re-enable-offline-compression.patch +Patch0013: 0013-Revert-Switch-to-oslo.sphinx.patch BuildArch: noarch -- 2.45.2