From a12957c5df92abd0aa18b36ecab9f7543ebf83b2bebb90f0962b025be4cbe0ce Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 21 Sep 2015 09:01:34 +0000 Subject: [PATCH] Accepting request 332225 from Cloud:OpenStack:Master - update to 1.8.0: * Strip comments present in setup.cfg * Protect WSGI application with a critical section - Remove 0001-Remove-sphinx_config.init_values-manual-call.patch Fixed upstream - update to 1.8.0: * Strip comments present in setup.cfg * Protect WSGI application with a critical section - Remove 0001-Remove-sphinx_config.init_values-manual-call.patch Fixed upstream OBS-URL: https://build.opensuse.org/request/show/332225 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=47 --- ...phinx_config.init_values-manual-call.patch | 67 ------------------- pbr-1.7.0.tar.gz | 3 - pbr-1.8.0.tar.gz | 3 + python-pbr-doc.changes | 9 +++ python-pbr-doc.spec | 6 +- python-pbr.changes | 9 +++ python-pbr.spec | 6 +- 7 files changed, 23 insertions(+), 80 deletions(-) delete mode 100644 0001-Remove-sphinx_config.init_values-manual-call.patch delete mode 100644 pbr-1.7.0.tar.gz create mode 100644 pbr-1.8.0.tar.gz diff --git a/0001-Remove-sphinx_config.init_values-manual-call.patch b/0001-Remove-sphinx_config.init_values-manual-call.patch deleted file mode 100644 index 8febc12..0000000 --- a/0001-Remove-sphinx_config.init_values-manual-call.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 12e36886fe343f8103a21c60d6925115ad8dbc26 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. - -Commit 1dfe9ef348c777bef67b2c2b1d35e50ebc720333 already introduced this -change and commit e41a9180ed3103bb45fa1d1be93ba951016b029c reverted it -due to build failures with Sphinx 1.1.3 . The failure occurred because -using the application class to detect if man pages can build raised a -warning which was treated as error. This case is now handled and tested -with Sphinx 1.1.3 and 1.3.1. - -Change-Id: Idf6c7b329880c6698b61ee9e88f29c0f6e0956bf -Closes-Bug: #1379998 ---- - pbr/builddoc.py | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/pbr/builddoc.py b/pbr/builddoc.py -index 3c9a9a1..f7d7697 100644 ---- a/pbr/builddoc.py -+++ b/pbr/builddoc.py -@@ -27,7 +27,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 -@@ -129,10 +128,21 @@ 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: -+ -+ # NOTE(toabctl): creating the app with "warningiserror=False" is -+ # used to detect if man_pages are available.Only needed for sphinx<1.3 -+ # See also https://github.com/sphinx-doc/sphinx/issues/1933 -+ 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=False) -+ -+ if self.builder == 'man' and len(app.config.man_pages) == 0: - return -+ -+ # NOTE(toabctl): Now create the app with "warningiserror=True for real -+ # usage - app = application.Sphinx( - self.source_dir, self.config_dir, - self.builder_target_dir, self.doctree_dir, --- -2.4.5 - diff --git a/pbr-1.7.0.tar.gz b/pbr-1.7.0.tar.gz deleted file mode 100644 index bee5925..0000000 --- a/pbr-1.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6e696dbd2b311225e3a21fe11d611989434cb366ff7919cef5ef1add859526e -size 99850 diff --git a/pbr-1.8.0.tar.gz b/pbr-1.8.0.tar.gz new file mode 100644 index 0000000..71ea000 --- /dev/null +++ b/pbr-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44a0ef9295bb59698f461124741a21a0f7f76d42e160d8a0a4bf1693338036fc +size 102868 diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes index 6dab05b..3799eb2 100644 --- a/python-pbr-doc.changes +++ b/python-pbr-doc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Sep 20 09:03:29 UTC 2015 - tbechtold@suse.com + +- update to 1.8.0: + * Strip comments present in setup.cfg + * Protect WSGI application with a critical section +- Remove 0001-Remove-sphinx_config.init_values-manual-call.patch + Fixed upstream + ------------------------------------------------------------------- Wed Sep 9 06:42:06 UTC 2015 - tbechtold@suse.com diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index 7e10f3d..b3cbd42 100644 --- a/python-pbr-doc.spec +++ b/python-pbr-doc.spec @@ -17,7 +17,7 @@ Name: python-pbr-doc -Version: 1.7.0 +Version: 1.8.0 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 @@ -25,9 +25,6 @@ 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 -# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/ -# needed to be abe to use pbr with newer Sphinx versions -Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch BuildRequires: fdupes BuildRequires: python-devel # Documentation requirements: @@ -44,7 +41,6 @@ This package contains documentation files for python-pbr %prep %setup -q -n pbr-%{version} -%patch0 -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py diff --git a/python-pbr.changes b/python-pbr.changes index 6eab052..1b71b54 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Sep 20 09:03:29 UTC 2015 - tbechtold@suse.com + +- update to 1.8.0: + * Strip comments present in setup.cfg + * Protect WSGI application with a critical section +- Remove 0001-Remove-sphinx_config.init_values-manual-call.patch + Fixed upstream + ------------------------------------------------------------------- Wed Sep 9 06:42:06 UTC 2015 - tbechtold@suse.com diff --git a/python-pbr.spec b/python-pbr.spec index 66004b1..4c21e95 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 1.7.0 +Version: 1.8.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -29,9 +29,6 @@ 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 -# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/ -# needed to be abe to use pbr with newer Sphinx versions -Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4 @@ -69,7 +66,6 @@ information. %prep %setup -q -n pbr-%{version} -%patch0 -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py