diff --git a/0001-Remove-sphinx_config.init_values-manual-call.patch b/0001-Remove-sphinx_config.init_values-manual-call.patch new file mode 100644 index 0000000..0ad180b --- /dev/null +++ b/0001-Remove-sphinx_config.init_values-manual-call.patch @@ -0,0 +1,56 @@ +From 1dfe9ef348c777bef67b2c2b1d35e50ebc720333 Mon Sep 17 00:00:00 2001 +From: Thomas Bechtold +Date: Tue, 2 Jun 2015 18:40:38 +0200 +Subject: [PATCH] Remove sphinx_config.init_values() manual call + +The function signature for Sphinx's config.init_values() changed since +version 1.3. That leads to: + +TypeError: init_values() takes exactly 2 arguments (1 given) + +But the function is already correctly called from +application.Sphinx()'s constructor. So use the configuration object +from the application instead of creating an own config object. + +Change-Id: I343c26560bfe5116d5348b50b1890b3442ed845a +Closes-Bug: #1379998 +--- + pbr/builddoc.py | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/pbr/builddoc.py b/pbr/builddoc.py +index 7c9916b..60f2afd 100644 +--- a/pbr/builddoc.py ++++ b/pbr/builddoc.py +@@ -26,7 +26,6 @@ except ImportError: + try: + from sphinx import apidoc + from sphinx import application +- from sphinx import config + from sphinx import setup_command + except Exception as e: + # NOTE(dhellmann): During the installation of docutils, setuptools +@@ -126,16 +125,16 @@ class LocalBuildDoc(setup_command.BuildDoc): + confoverrides['release'] = self.release + if self.today: + confoverrides['today'] = self.today +- sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) +- sphinx_config.init_values() +- if self.builder == 'man' and len(sphinx_config.man_pages) == 0: +- return ++ + app = application.Sphinx( + self.source_dir, self.config_dir, + self.builder_target_dir, self.doctree_dir, + self.builder, confoverrides, status_stream, + freshenv=self.fresh_env, warningiserror=True) + ++ if self.builder == 'man' and len(app.config.man_pages) == 0: ++ return ++ + try: + app.build(force_all=self.all_files) + except Exception as err: +-- +2.4.2 + diff --git a/pbr-0.10.8-fix-sphinx-init_values.patch b/pbr-0.10.8-fix-sphinx-init_values.patch deleted file mode 100644 index da13014..0000000 --- a/pbr-0.10.8-fix-sphinx-init_values.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/pbr/builddoc.py -=================================================================== ---- a/pbr/builddoc.py -+++ b/pbr/builddoc.py -@@ -123,7 +123,7 @@ class LocalBuildDoc(setup_command.BuildD - if self.today: - confoverrides['today'] = self.today - sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) -- sphinx_config.init_values() -+ sphinx_config.init_values(log.info) - if self.builder == 'man' and len(sphinx_config.man_pages) == 0: - return - app = application.Sphinx( diff --git a/pbr-0.11.0.tar.gz b/pbr-0.11.0.tar.gz deleted file mode 100644 index 0670618..0000000 --- a/pbr-0.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7f0d69aef367a764d69a4728afd966025ce9394d6029a924ef838ecdf592f6d -size 94347 diff --git a/pbr-1.0.1.tar.gz b/pbr-1.0.1.tar.gz new file mode 100644 index 0000000..0a8ef2c --- /dev/null +++ b/pbr-1.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc3d19ab844647388cc13a3df403bda872d2fc16662803d0ebcc1787d3645552 +size 96438 diff --git a/python-pbr.changes b/python-pbr.changes index d2a3dfd..7c07981 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Jun 2 16:19:13 UTC 2015 - tbechtold@suse.com + +- update to 1.0.1: + * Remove self.pre_run calls in packaging.py + * Update hacking to 0.10.x series + * Teach pbr to read extras and env markers + * Bump integration test timeouts + * Finish removing invocations of pip + * Advertise support for Python3.4 + * Issue #1451976: handle commits with non-utf8 text + * Parallelise integration tests +- Removed pbr-0.10.8-fix-sphinx-init_values.patch . Replaced upstream + with 0001-Remove-sphinx_config.init_values-manual-call.patch +- Added 0001-Remove-sphinx_config.init_values-manual-call.patch + ------------------------------------------------------------------- Tue May 5 10:57:35 UTC 2015 - benoit.monin@gmx.fr diff --git a/python-pbr.spec b/python-pbr.spec index 277c574..a7f71a9 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 0.11.0 +Version: 1.0.1 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -29,7 +29,8 @@ Group: Development/Languages/Python Url: http://pypi.python.org/pypi/pbr Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python-pbr-rpmlintrc -Patch: pbr-0.10.8-fix-sphinx-init_values.patch +# PATCH-FIX-UPSTREAM needed to be able to use Sphinx >= 1.3 versions +Patch: 0001-Remove-sphinx_config.init_values-manual-call.patch BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4