From f00dbbd6fcc9f45756b5ee6653e4d9237298ab4fff244dd44bb5e5f1e8e4e56b Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Thu, 9 Mar 2017 11:15:04 +0000 Subject: [PATCH] Accepting request 477946 from home:aplanas:branches:devel:languages:python - Add make_oslosphinx_optional.patch https://review.openstack.org/#/c/443555/ - 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 OBS-URL: https://build.opensuse.org/request/show/477946 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=61 --- 0001-Don-t-ignore-data-files.patch | 96 ------------------- ...raise-exception-on-missing-man-pages.patch | 50 ---------- make_oslosphinx_optional.patch | 37 +++++++ pbr-1.10.0.tar.gz | 3 - pbr-2.0.0.tar.gz | 3 + python-pbr-doc.changes | 48 ++++++++++ python-pbr-doc.spec | 7 +- python-pbr.changes | 42 ++++++++ python-pbr.spec | 6 +- 9 files changed, 134 insertions(+), 158 deletions(-) delete mode 100644 0001-Don-t-ignore-data-files.patch delete mode 100644 0001-Don-t-raise-exception-on-missing-man-pages.patch create mode 100644 make_oslosphinx_optional.patch delete mode 100644 pbr-1.10.0.tar.gz create mode 100644 pbr-2.0.0.tar.gz diff --git a/0001-Don-t-ignore-data-files.patch b/0001-Don-t-ignore-data-files.patch deleted file mode 100644 index 4b56b8b..0000000 --- a/0001-Don-t-ignore-data-files.patch +++ /dev/null @@ -1,96 +0,0 @@ -From a432bc2930ad0c5463163654bc18a18f8e2b417e Mon Sep 17 00:00:00 2001 -From: Sachi King -Date: Thu, 21 Jul 2016 17:15:34 +1000 -Subject: [PATCH] Don't ignore data-files - -We're currently ignoring data-files, and it looks like the problem -would sometimes be present starting with 2796f9, 0.5.7, and always be present -from 04984a, 0.5.15. - -This normalises all config keys from - to _ as soon as we read the -config, which means future access and modification does not need to -concern itself with the possibility of the key being a '-' instead '_'. - -This should make it more difficult for code accessing/modifying values -in the config to clobber user set values or be unaware of them, like -in the case of the files hook. - -As well, support download-url, but properly expose it as download_url. - -Co-Authored-By: Julien Danjou -Change-Id: I062774c706b8f7339dda46689a226b80ae6ac277 ---- - pbr/tests/test_packaging.py | 11 +++++++++++ - pbr/tests/testpackage/setup.cfg | 2 +- - pbr/util.py | 6 +++--- - 3 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py -index f532b76..b84cc9a 100644 ---- a/pbr/tests/test_packaging.py -+++ b/pbr/tests/test_packaging.py -@@ -304,6 +304,17 @@ class TestPackagingInGitRepoWithCommit(base.BaseTestCase): - self.expectThat(stdout, matchers.Contains('Generating ChangeLog')) - - -+class TestExtrafileInstallation(base.BaseTestCase): -+ def test_install_glob(self): -+ stdout, _, _ = self.run_setup( -+ 'install', '--root', self.temp_dir + 'installed', -+ allow_fail=False) -+ self.expectThat( -+ stdout, matchers.Contains('copying data_files/a.txt')) -+ self.expectThat( -+ stdout, matchers.Contains('copying data_files/b.txt')) -+ -+ - class TestPackagingInGitRepoWithoutCommit(base.BaseTestCase): - - def setUp(self): -diff --git a/pbr/tests/testpackage/setup.cfg b/pbr/tests/testpackage/setup.cfg -index c4ba378..a6d127a 100644 ---- a/pbr/tests/testpackage/setup.cfg -+++ b/pbr/tests/testpackage/setup.cfg -@@ -30,7 +30,7 @@ keywords = packaging, distutils, setuptools - [files] - packages = pbr_testpackage - package-data = testpackage = package_data/*.txt --data-files = testpackage/data_files = data_files/*.txt -+data-files = testpackage/data_files = data_files/* - extra-files = extra-file.txt - - [entry_points] -diff --git a/pbr/util.py b/pbr/util.py -index daad138..30853c6 100644 ---- a/pbr/util.py -+++ b/pbr/util.py -@@ -105,7 +105,7 @@ D1_D2_SETUP_ARGS = { - "description": ("metadata", "summary"), - "keywords": ("metadata",), - "long_description": ("metadata", "description"), -- "download-url": ("metadata",), -+ "download_url": ("metadata",), - "classifiers": ("metadata", "classifier"), - "platforms": ("metadata", "platform"), # ** - "license": ("metadata",), -@@ -212,6 +212,8 @@ def cfg_to_args(path='setup.cfg', script_args=()): - config = {} - for section in parser.sections(): - config[section] = dict(parser.items(section)) -+ for k in config[section]: -+ config[section][k.replace('-', '_')] = config[section].pop(k) - - # Run setup_hooks, if configured - setup_hooks = has_get_option(config, 'global', 'setup_hooks') -@@ -649,8 +651,6 @@ def run_command_hooks(cmd_obj, hook_kind): - def has_get_option(config, section, option): - if section in config and option in config[section]: - return config[section][option] -- elif section in config and option.replace('_', '-') in config[section]: -- return config[section][option.replace('_', '-')] - else: - return False - --- -2.11.0 - diff --git a/0001-Don-t-raise-exception-on-missing-man-pages.patch b/0001-Don-t-raise-exception-on-missing-man-pages.patch deleted file mode 100644 index 8a0ce83..0000000 --- a/0001-Don-t-raise-exception-on-missing-man-pages.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9fd7aa2cc7fe50f68bd9c86c3db7a8f7ae710c05 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller -Date: Wed, 21 Dec 2016 23:29:52 +0100 -Subject: [PATCH] Don't raise exception on missing man pages - -The revert in Ia6cfbfe5b10a5b714fbb9f21ca61380aaf231638 actually -broke Sphinx 1.3.x support again. Try to fix it for real this -time by avoiding an exception on missing man_pages. - -NOTE(dmllr): don't change dict while iterating over it, hopefully -this fixes the gating failure with python 3.5.x - -Change-Id: I52d45fa0a0d42de690d3a492068f7bb03483a224 -Related-Bug: 1379998 ---- - pbr/builddoc.py | 3 ++- - pbr/util.py | 6 +++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -Index: pbr-1.10.0/pbr/builddoc.py -=================================================================== ---- pbr-1.10.0.orig/pbr/builddoc.py -+++ pbr-1.10.0/pbr/builddoc.py -@@ -138,7 +138,8 @@ class LocalBuildDoc(setup_command.BuildD - sphinx_config.init_values(warnings.warn) - else: - sphinx_config.init_values() -- if self.builder == 'man' and len(sphinx_config.man_pages) == 0: -+ if self.builder == 'man' and len( -+ getattr(sphinx_config, 'man_pages', '')) == 0: - return - app = application.Sphinx( - self.source_dir, self.config_dir, -Index: pbr-1.10.0/pbr/util.py -=================================================================== ---- pbr-1.10.0.orig/pbr/util.py -+++ pbr-1.10.0/pbr/util.py -@@ -211,9 +211,9 @@ def cfg_to_args(path='setup.cfg', script - parser.read(path) - config = {} - for section in parser.sections(): -- config[section] = dict(parser.items(section)) -- for k in config[section]: -- config[section][k.replace('-', '_')] = config[section].pop(k) -+ config[section] = dict() -+ for k, value in parser.items(section): -+ config[section][k.replace('-', '_')] = value - - # Run setup_hooks, if configured - setup_hooks = has_get_option(config, 'global', 'setup_hooks') diff --git a/make_oslosphinx_optional.patch b/make_oslosphinx_optional.patch new file mode 100644 index 0000000..3b49e75 --- /dev/null +++ b/make_oslosphinx_optional.patch @@ -0,0 +1,37 @@ +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/pbr-1.10.0.tar.gz b/pbr-1.10.0.tar.gz deleted file mode 100644 index f4dde5b..0000000 --- a/pbr-1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:186428c270309e6fdfe2d5ab0949ab21ae5f7dea831eab96701b86bd666af39c -size 111425 diff --git a/pbr-2.0.0.tar.gz b/pbr-2.0.0.tar.gz new file mode 100644 index 0000000..b5e7a8b --- /dev/null +++ b/pbr-2.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d +size 98568 diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes index 4d3bd44..7be5760 100644 --- a/python-pbr-doc.changes +++ b/python-pbr-doc.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Thu Mar 9 10:40:10 UTC 2017 - aplanas@suse.com + +- Add make_oslosphinx_optional.patch + https://review.openstack.org/#/c/443555/ + +------------------------------------------------------------------- +Wed Mar 8 10:30:49 UTC 2017 - aplanas@suse.com + +- 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) + ------------------------------------------------------------------- Thu Feb 23 15:22:44 UTC 2017 - jmatejek@suse.com diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index 33d7044..933deb9 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: 1.10.0 +Version: 2.0.0 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 @@ -26,8 +26,8 @@ Group: Development/Languages/Python Url: http://pypi.python.org/pypi/pbr Source: https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7/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 @@ This package contains documentation files for python-pbr %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 diff --git a/python-pbr.changes b/python-pbr.changes index f08b1ff..2a1f76e 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Wed Mar 8 10:30:49 UTC 2017 - aplanas@suse.com + +- 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) + ------------------------------------------------------------------- Mon Feb 27 13:11:37 UTC 2017 - jmatejek@suse.com diff --git a/python-pbr.spec b/python-pbr.spec index dc70a4d..15d9e00 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -22,7 +22,7 @@ %{?!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 @@ -30,8 +30,6 @@ Group: Development/Languages/Python Url: http://pypi.python.org/pypi/pbr Source: https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7/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 BuildRequires: %{python_module devel} BuildRequires: %{python_module pip >= 1.4} BuildRequires: fdupes @@ -67,8 +65,6 @@ information. %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