From a8b2eebb2fc6340dd462debd42c259ae5c3ec2aed503607b30800a55f375fa88 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 18 May 2017 11:44:05 +0000 Subject: [PATCH 1/4] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=67 --- ...x-config-using-application-instead-o.patch | 101 ------------------ pbr-2.0.0.tar.gz | 3 - pbr-3.0.1.tar.gz | 3 + python-pbr-doc.spec | 2 +- python-pbr.changes | 24 +++++ python-pbr.spec | 5 +- 6 files changed, 29 insertions(+), 109 deletions(-) delete mode 100644 0001-Initialize-sphinx-config-using-application-instead-o.patch delete mode 100644 pbr-2.0.0.tar.gz create mode 100644 pbr-3.0.1.tar.gz diff --git a/0001-Initialize-sphinx-config-using-application-instead-o.patch b/0001-Initialize-sphinx-config-using-application-instead-o.patch deleted file mode 100644 index e11b820..0000000 --- a/0001-Initialize-sphinx-config-using-application-instead-o.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 2d7c0045f402b31d6223437ba25423eeb32278e1 Mon Sep 17 00:00:00 2001 -From: Alfredo Moralejo -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 - diff --git a/pbr-2.0.0.tar.gz b/pbr-2.0.0.tar.gz deleted file mode 100644 index b5e7a8b..0000000 --- a/pbr-2.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d -size 98568 diff --git a/pbr-3.0.1.tar.gz b/pbr-3.0.1.tar.gz new file mode 100644 index 0000000..0af9a1f --- /dev/null +++ b/pbr-3.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91 +size 100518 diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index 3ceedd2..66e95e1 100644 --- a/python-pbr-doc.spec +++ b/python-pbr-doc.spec @@ -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 diff --git a/python-pbr.changes b/python-pbr.changes index 5546dad..c25384b 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -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 diff --git a/python-pbr.spec b/python-pbr.spec index 50a7808..07f6e5b 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -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 From 5a38c9868336c49697dd6f6a28f8958c07ebfe0e4829b8c75e25ff660b38bae8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 18 May 2017 14:13:15 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=68 --- python-pbr.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-pbr.spec b/python-pbr.spec index 07f6e5b..4998dba 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -38,7 +38,6 @@ BuildRequires: python-rpm-macros %if %{with test} #BuildRequires: python-coverage >= 3.6 BuildRequires: %{python_module fixtures >= 1.3.1} -BuildRequires: %{python_module hacking >= 0.9.2} BuildRequires: %{python_module mock >= 1.2} BuildRequires: %{python_module python-subunit >= 0.0.18} BuildRequires: %{python_module six >= 1.9.0} From 3e4dd6aa912f8c3ca2634f8b964ab6c5f910ebe1371e6776228270897b73ec2c Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Fri, 23 Jun 2017 15:42:13 +0000 Subject: [PATCH 3/4] - drop upstreamed make_oslosphinx_optional.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=69 --- make_oslosphinx_optional.patch | 37 ---------------------------------- python-pbr-doc.changes | 5 +++++ python-pbr-doc.spec | 3 --- 3 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 make_oslosphinx_optional.patch diff --git a/make_oslosphinx_optional.patch b/make_oslosphinx_optional.patch deleted file mode 100644 index 3b49e75..0000000 --- a/make_oslosphinx_optional.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ebd9ae850a18b26f37738a67b7e528896b249e40 Mon Sep 17 00:00:00 2001 -From: Thomas Bechtold -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 - diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes index 97818e7..d57d5f5 100644 --- a/python-pbr-doc.changes +++ b/python-pbr-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 23 15:21:37 UTC 2017 - jmatejek@suse.com + +- drop upstreamed make_oslosphinx_optional.patch + ------------------------------------------------------------------- Wed Mar 29 11:59:55 UTC 2017 - tbechtold@suse.com diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index 66e95e1..f7ffe6b 100644 --- a/python-pbr-doc.spec +++ b/python-pbr-doc.spec @@ -26,8 +26,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 -# 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 +39,6 @@ This package contains documentation files for python-pbr %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 From f8ee4505e9195461eb13335eda073ed3c47cd08dee1134c708e7f35123b7c4c2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 30 Jun 2017 08:08:23 +0000 Subject: [PATCH 4/4] Accepting request 507129 from home:tbechtold:branches:devel:languages:python - update to 3.1.1: * Restore previous IP binding * allow user to override the output location of api docs * fix tests based on API change in Sphinx * Updated from global requirements * Add binding option for WSGI server * Ignore index URL lines in requirements.txt files - update to 3.1.1: * Restore previous IP binding * allow user to override the output location of api docs * fix tests based on API change in Sphinx * Updated from global requirements * Add binding option for WSGI server * Ignore index URL lines in requirements.txt files OBS-URL: https://build.opensuse.org/request/show/507129 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=70 --- pbr-3.0.1.tar.gz | 3 --- pbr-3.1.1.tar.gz | 3 +++ python-pbr-doc.changes | 11 +++++++++++ python-pbr-doc.spec | 2 +- python-pbr.changes | 11 +++++++++++ python-pbr.spec | 2 +- 6 files changed, 27 insertions(+), 5 deletions(-) delete mode 100644 pbr-3.0.1.tar.gz create mode 100644 pbr-3.1.1.tar.gz diff --git a/pbr-3.0.1.tar.gz b/pbr-3.0.1.tar.gz deleted file mode 100644 index 0af9a1f..0000000 --- a/pbr-3.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91 -size 100518 diff --git a/pbr-3.1.1.tar.gz b/pbr-3.1.1.tar.gz new file mode 100644 index 0000000..f2da287 --- /dev/null +++ b/pbr-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1 +size 102665 diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes index d57d5f5..172e1f3 100644 --- a/python-pbr-doc.changes +++ b/python-pbr-doc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 29 16:16:36 UTC 2017 - tbechtold@suse.com + +- update to 3.1.1: + * Restore previous IP binding + * allow user to override the output location of api docs + * fix tests based on API change in Sphinx + * Updated from global requirements + * Add binding option for WSGI server + * Ignore index URL lines in requirements.txt files + ------------------------------------------------------------------- Fri Jun 23 15:21:37 UTC 2017 - jmatejek@suse.com diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index f7ffe6b..7f59e55 100644 --- a/python-pbr-doc.spec +++ b/python-pbr-doc.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pbr-doc -Version: 3.0.1 +Version: 3.1.1 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 diff --git a/python-pbr.changes b/python-pbr.changes index c25384b..879854f 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 29 16:16:36 UTC 2017 - tbechtold@suse.com + +- update to 3.1.1: + * Restore previous IP binding + * allow user to override the output location of api docs + * fix tests based on API change in Sphinx + * Updated from global requirements + * Add binding option for WSGI server + * Ignore index URL lines in requirements.txt files + ------------------------------------------------------------------- Thu May 18 11:36:19 UTC 2017 - dmueller@suse.com diff --git a/python-pbr.spec b/python-pbr.spec index 4998dba..787131f 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -22,7 +22,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pbr -Version: 3.0.1 +Version: 3.1.1 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0