pool/python-pbr
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to pbr-3.0.1:

Browse Source 
* builddoc: uses the new Sphinx 1.6 code for multiple builder
  * Updated from global requirements
  * Fix missing comment from previous change
  * trivial: Add note about multiple builders support
  * Remove 'build\_sphinx\_latex'
  * Stop building man pages by default
  * docs: Use definition lists
  * add image.nonlocal\_uri to the list of warnings ignored
  * doc: Document Sphinx integration
  * add changelog to published documentation
  * Lazy import pkg\_resources
  * Add Changelog build handling for invalid chars
  * Initialize sphinx config using application instead of config
  * Make oslosphinx optional
  * Updated from global requirements
  * Also generate XML coverage report
  * Update to a newer hacking library
- drop 0001-Initialize-sphinx-config-using-application-instead-o.patch
  Upstream

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=67
This commit is contained in:
Dirk Mueller 2017-05-18 11:44:05 +00:00 committed by Git OBS Bridge
parent 22ec98a26f
commit a8b2eebb2f
6 changed files with 29 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
0001-Initialize-sphinx-config-using-application-instead-o.patch
View File

@ -1,101 +0,0 @@
From 2d7c0045f402b31d6223437ba25423eeb32278e1 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Wed, 22 Mar 2017 04:56:56 -0400
Subject: [PATCH] Initialize sphinx config using application instead of config
Currently sphinx config is initialized using sphinx.config,
however in recent versions of Sphinx, plugin specific parameters
as man_pages for man builder has been moved to the extension
and is not initialized from sphinx.config but using sphinx.application.
This is making man_pages to be empty when using sphinx 1.5 and man
builder is not properly called.
This patch initializes sphinx config using sphinx.application which
works fine with both old and new Sphinx versions.
Closes-Bug: #1674795
Depends-On: I7bde8fc1f2a7db5bd73635aa197377bf5ac614d2
Change-Id: Ib7c1a6fe8fbb5acfcfcfac61d0b53f080ff2b1e4
---
pbr/builddoc.py | 17 ++++-------------
pbr/tests/test_setup.py | 6 +++++-
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/pbr/builddoc.py b/pbr/builddoc.py
index f51b283..4f05673 100644
--- a/pbr/builddoc.py
+++ b/pbr/builddoc.py
@@ -17,9 +17,7 @@
from distutils import log
import fnmatch
import os
-import pkg_resources
import sys
-import warnings
try:
import cStringIO
@@ -29,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
@@ -134,16 +131,6 @@ 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_ver = pkg_resources.parse_version(
- pkg_resources.get_distribution("sphinx").version)
- if sphinx_ver > pkg_resources.parse_version('1.2.3'):
- sphinx_config.init_values(warnings.warn)
- else:
- sphinx_config.init_values()
- if self.builder == 'man' and len(
- getattr(sphinx_config, 'man_pages', '')) == 0:
- return
if self.sphinx_initialized:
confoverrides['suppress_warnings'] = [
'app.add_directive', 'app.add_role',
@@ -153,6 +140,10 @@ class LocalBuildDoc(setup_command.BuildDoc):
self.builder_target_dir, self.doctree_dir,
self.builder, confoverrides, status_stream,
freshenv=self.fresh_env, warningiserror=self.warning_is_error)
+ sphinx_config = app.config
+ if self.builder == 'man' and len(
+ getattr(sphinx_config, 'man_pages', '')) == 0:
+ return
self.sphinx_initialized = True
try:
diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py
index 0754a8d..0930e35 100644
--- a/pbr/tests/test_setup.py
+++ b/pbr/tests/test_setup.py
@@ -224,6 +224,10 @@ class GitLogsTest(base.BaseTestCase):
self.assertTrue(co_author in authors)
+class _SphinxConfig(object):
+ man_pages = ['foo']
+
+
class BaseSphinxTest(base.BaseTestCase):
def setUp(self):
@@ -234,7 +238,7 @@ class BaseSphinxTest(base.BaseTestCase):
self.useFixture(fixtures.MonkeyPatch(
"sphinx.application.Sphinx.build", lambda *a, **kw: None))
self.useFixture(fixtures.MonkeyPatch(
- "sphinx.config.Config.man_pages", ['foo']))
+ "sphinx.application.Sphinx.config", _SphinxConfig))
self.useFixture(fixtures.MonkeyPatch(
"sphinx.config.Config.init_values", lambda *a: None))
self.useFixture(fixtures.MonkeyPatch(
--
2.12.0

3
pbr-2.0.0.tar.gz
View File

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

3
pbr-3.0.1.tar.gz Normal file
View File

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

2
python-pbr-doc.spec
View File

@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pbr-doc
Version: 2.0.0
Version: 3.0.1
Release: 0
Summary: Documentation for python-pbr
License: Apache-2.0

24
python-pbr.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu May 18 11:36:19 UTC 2017 - dmueller@suse.com
- Update to pbr-3.0.1:
* builddoc: uses the new Sphinx 1.6 code for multiple builder
* Updated from global requirements
* Fix missing comment from previous change
* trivial: Add note about multiple builders support
* Remove 'build\_sphinx\_latex'
* Stop building man pages by default
* docs: Use definition lists
* add image.nonlocal\_uri to the list of warnings ignored
* doc: Document Sphinx integration
* add changelog to published documentation
* Lazy import pkg\_resources
* Add Changelog build handling for invalid chars
* Initialize sphinx config using application instead of config
* Make oslosphinx optional
* Updated from global requirements
* Also generate XML coverage report
* Update to a newer hacking library
- drop 0001-Initialize-sphinx-config-using-application-instead-o.patch
Upstream
-------------------------------------------------------------------
Mon Apr 3 05:05:43 UTC 2017 - tbechtold@suse.com

5
python-pbr.spec
View File

@ -22,7 +22,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pbr
Version: 2.0.0
Version: 3.0.1
Release: 0
Summary: Python Build Reasonableness
License: Apache-2.0
@ -30,8 +30,6 @@ Group: Development/Languages/Python
Url: http://pypi.python.org/pypi/pbr
Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz
Source1: python-pbr-rpmlintrc
# PATCH-FIX-UPSTREAM 0001-Initialize-sphinx-config-using-application-instead-o.patch~- https://review.openstack.org/#/c/448455/
Patch1: 0001-Initialize-sphinx-config-using-application-instead-o.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pip >= 1.4}
BuildRequires: fdupes
@ -67,7 +65,6 @@ information.
%prep
%setup -q -n pbr-%{version}
%patch1 -p1
# Get rid of ugly build-time deps that require network:
sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py