Accepting request 311216 from home:tbechtold:branches:devel:languages:python

- update to 1.1.0:
  * Fix test case to be runnable with gnupg 2.1
  * More explicit data_files install location docs
  * Move CapturedSubprocess fixture to base
  * Remove sphinx_config.init_values() manual call
  * Updated from global requirements
  * builddoc: allow to use fnmatch-style exclusion for autodoc
  * doc: add some basic doc about pbr doc options
  * Add home-page into sample setup.cfg
  * Make setup.py --help-commands work without testrepository
- Removed 0001-Remove-sphinx_config.init_values-manual-call.patch
  Applied upstream.

OBS-URL: https://build.opensuse.org/request/show/311216
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=31

0001-Remove-sphinx_config.init_values-manual-call.patch

@@ -1,56 +0,0 @@
-From 1dfe9ef348c777bef67b2c2b1d35e50ebc720333 Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-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
-

pbr-1.0.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc3d19ab844647388cc13a3df403bda872d2fc16662803d0ebcc1787d3645552
-size 96438

pbr-1.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d53899758799094f4de673b58abe310fe96e1f5d0ed02feec11e7aba197aabd3
+size 97535

python-pbr.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jun  9 07:17:47 UTC 2015 - tbechtold@suse.com
+
+- update to 1.1.0:
+  * Fix test case to be runnable with gnupg 2.1
+  * More explicit data_files install location docs
+  * Move CapturedSubprocess fixture to base
+  * Remove sphinx_config.init_values() manual call
+  * Updated from global requirements
+  * builddoc: allow to use fnmatch-style exclusion for autodoc
+  * doc: add some basic doc about pbr doc options
+  * Add home-page into sample setup.cfg
+  * Make setup.py --help-commands work without testrepository
+- Removed 0001-Remove-sphinx_config.init_values-manual-call.patch
+  Applied upstream.
+
 -------------------------------------------------------------------
 Tue Jun  2 16:19:13 UTC 2015 - tbechtold@suse.com
 

python-pbr.spec

@@ -21,7 +21,7 @@
 %bcond_with test
 
 Name:           python-pbr
-Version:        1.0.1
+Version:        1.1.0
 Release:        0
 Summary:        Python Build Reasonableness
 License:        Apache-2.0
@@ -29,8 +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
-# 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
@@ -78,7 +76,6 @@ This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n pbr-%{version}
-%patch -p1
 # Get rid of ugly build-time deps that require network:
 sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py