Hello community, here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2017-04-19 18:06:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pbr (Old) and /work/SRC/openSUSE:Factory/.python-pbr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pbr" Wed Apr 19 18:06:46 2017 rev:28 rq:484778 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pbr/python-pbr-doc.changes 2017-02-27 18:42:05.382555434 +0100 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr-doc.changes 2017-04-19 18:06:49.571787337 +0200 @@ -1,0 +2,53 @@ +Wed Mar 29 11:59:55 UTC 2017 - [email protected] + +- Fix Source url + +------------------------------------------------------------------- +Thu Mar 9 10:40:10 UTC 2017 - [email protected] + +- Add make_oslosphinx_optional.patch + https://review.openstack.org/#/c/443555/ + +------------------------------------------------------------------- +Wed Mar 8 10:30:49 UTC 2017 - [email protected] + +- Update to pbr-2.0.0 + * tox: Don't set skipsdist=True + * Stop using 'warnerrors' + * doc: Clarify sections in 'setup.cfg' + * Updated from global requirements + * Remove discover from test-requirements + * Add Constraints support + * Don't raise exception on missing man pages + * Updated from global requirements + * Clean imports in code + * Updated from global requirements + * Docstrings should not start with a space + * Changed the home-page link + * Update .coveragerc after the removal of openstack directory + * coverage package name option, doc improvement + * Updated from global requirements + * Deprecated warning for SafeConfigParser + * Add more words to a confusing error message + * Don't ignore data-files + * Change assertTrue(isinstance()) by optimal assert + * Fix handling of old git log output + * Fix typo in the index.rst + * Expose deb version to match exposing rpm version + * Replace OpenStack LLC with OpenStack Foundation + * Updated from global requirements + * Fix pypy soabi tests + * Add Python 3.5 classifier and venv + * Fix argument order for assertEqual to (expected, observed) + * Move to oslosphinx + * Updated from global requirements + * Restore warnerrors behavior and support Sphinx 1.4 + * Updated from global requirements + * Updated from global requirements + * Updated from global requirements + * Fix pypy wsgi tests + * Remember the insertion order for pbr.json +- Remove 0001-Don-t-ignore-data-files.patch (included) +- Remove 0001-Don-t-raise-exception-on-missing-man-pages.patch (included) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-pbr/python-pbr.changes 2017-02-27 18:42:05.582527186 +0100 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr.changes 2017-04-19 18:06:49.699769234 +0200 @@ -1,0 +2,57 @@ +Mon Apr 3 05:05:43 UTC 2017 - [email protected] + +- Add 0001-Initialize-sphinx-config-using-application-instead-o.patch + +------------------------------------------------------------------- +Wed Mar 29 13:53:04 UTC 2017 - [email protected] + +- uninstall alternatives in %postun + +------------------------------------------------------------------- +Wed Mar 29 11:59:27 UTC 2017 - [email protected] + +- Fix Source url + +------------------------------------------------------------------- +Wed Mar 8 10:30:49 UTC 2017 - [email protected] + +- Update to pbr-2.0.0 + * tox: Don't set skipsdist=True + * Stop using 'warnerrors' + * doc: Clarify sections in 'setup.cfg' + * Updated from global requirements + * Remove discover from test-requirements + * Add Constraints support + * Don't raise exception on missing man pages + * Updated from global requirements + * Clean imports in code + * Updated from global requirements + * Docstrings should not start with a space + * Changed the home-page link + * Update .coveragerc after the removal of openstack directory + * coverage package name option, doc improvement + * Updated from global requirements + * Deprecated warning for SafeConfigParser + * Add more words to a confusing error message + * Don't ignore data-files + * Change assertTrue(isinstance()) by optimal assert + * Fix handling of old git log output + * Fix typo in the index.rst + * Expose deb version to match exposing rpm version + * Replace OpenStack LLC with OpenStack Foundation + * Updated from global requirements + * Fix pypy soabi tests + * Add Python 3.5 classifier and venv + * Fix argument order for assertEqual to (expected, observed) + * Move to oslosphinx + * Updated from global requirements + * Restore warnerrors behavior and support Sphinx 1.4 + * Updated from global requirements + * Updated from global requirements + * Updated from global requirements + * Fix pypy wsgi tests + * Remember the insertion order for pbr.json +- Remove 0001-Don-t-ignore-data-files.patch (included) +- Remove 0001-Don-t-raise-exception-on-missing-man-pages.patch (included) + +------------------------------------------------------------------- Old: ---- 0001-Don-t-ignore-data-files.patch 0001-Don-t-raise-exception-on-missing-man-pages.patch pbr-1.10.0.tar.gz New: ---- 0001-Initialize-sphinx-config-using-application-instead-o.patch make_oslosphinx_optional.patch pbr-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pbr-doc.spec ++++++ --- /var/tmp/diff_new_pack.k6g4wf/_old 2017-04-19 18:06:50.279687202 +0200 +++ /var/tmp/diff_new_pack.k6g4wf/_new 2017-04-19 18:06:50.283686635 +0200 @@ -18,16 +18,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pbr-doc -Version: 1.10.0 +Version: 2.0.0 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 Group: Development/Languages/Python Url: http://pypi.python.org/pypi/pbr -Source: https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7/pbr-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python-pbr-rpmlintrc -Patch0: 0001-Don-t-ignore-data-files.patch -Patch1: 0001-Don-t-raise-exception-on-missing-man-pages.patch +# make_oslosphinx_optional.patch - https://review.openstack.org/#/c/443555/ +Patch1: make_oslosphinx_optional.patch BuildRequires: fdupes # Documentation requirements: BuildRequires: python3-Sphinx >= 1.1.2 @@ -41,7 +41,6 @@ %prep %setup -q -n pbr-%{version} -%patch0 -p1 %patch1 -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py ++++++ python-pbr.spec ++++++ --- /var/tmp/diff_new_pack.k6g4wf/_old 2017-04-19 18:06:50.311682675 +0200 +++ /var/tmp/diff_new_pack.k6g4wf/_new 2017-04-19 18:06:50.311682675 +0200 @@ -22,16 +22,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pbr -Version: 1.10.0 +Version: 2.0.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 Group: Development/Languages/Python Url: http://pypi.python.org/pypi/pbr -Source: https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7/pbr-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python-pbr-rpmlintrc -Patch0: 0001-Don-t-ignore-data-files.patch -Patch1: 0001-Don-t-raise-exception-on-missing-man-pages.patch +# 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 +67,6 @@ %prep %setup -q -n pbr-%{version} -%patch0 -p1 %patch1 -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py @@ -91,7 +90,7 @@ %post %python_install_alternative pbr -%preun +%postun %python_uninstall_alternative pbr %files %{python_files} ++++++ 0001-Initialize-sphinx-config-using-application-instead-o.patch ++++++ >From 2d7c0045f402b31d6223437ba25423eeb32278e1 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo <[email protected]> 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 ++++++ make_oslosphinx_optional.patch ++++++ >From ebd9ae850a18b26f37738a67b7e528896b249e40 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <[email protected]> Date: Thu, 9 Mar 2017 11:29:48 +0100 Subject: [PATCH] Make oslosphinx optional Avoid cyclic dependencies between pbr and oslosphinx. So if oslosphinx is not available, continue to be able to generate the documentation. Change-Id: I4c1f8ea5cded268388dab29931055223f8999c8a --- doc/source/conf.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 31003c1..f0a78ec 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -8,8 +8,14 @@ sys.path.insert(0, os.path.abspath('../..')) # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', - 'oslosphinx'] +extensions = ['sphinx.ext.autodoc'] +# make oslosphinx optional to not increase the needed dependencies +try: + import oslosphinx +except ImportError: + pass +else: + extensions.append('oslosphinx') # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. -- 1.9.1 ++++++ pbr-1.10.0.tar.gz -> pbr-2.0.0.tar.gz ++++++ ++++ 2738 lines of diff (skipped)
