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

Accepting request 484778 from devel:languages:python

Browse Source 
- Fix Source url

- 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

OBS-URL: https://build.opensuse.org/request/show/484778
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pbr?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger
2017-04-19 16:06:46 +00:00
committed by Git OBS Bridge
parent 713f3428b1 22ec98a26f
commit 995cfa55f4
10 changed files with 260 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
0001-Don-t-ignore-data-files.patch
View File

@@ -1,96 +0,0 @@
From a432bc2930ad0c5463163654bc18a18f8e2b417e Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
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 <julien@danjou.info>
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

50
0001-Don-t-raise-exception-on-missing-man-pages.patch
View File

@@ -1,50 +0,0 @@
From 9fd7aa2cc7fe50f68bd9c86c3db7a8f7ae710c05 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
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')

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

@@ -0,0 +1,101 @@
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

37
make_oslosphinx_optional.patch Normal file
View File

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

3
pbr-1.10.0.tar.gz
View File

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

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

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

53
python-pbr-doc.changes
View File

@@ -1,3 +1,56 @@
-------------------------------------------------------------------
Wed Mar 29 11:59:55 UTC 2017 - tbechtold@suse.com
- Fix Source url
-------------------------------------------------------------------
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

9
python-pbr-doc.spec
View File

@@ -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 @@ 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

57
python-pbr.changes
View File

@@ -1,3 +1,60 @@
-------------------------------------------------------------------
Mon Apr 3 05:05:43 UTC 2017 - tbechtold@suse.com
- Add 0001-Initialize-sphinx-config-using-application-instead-o.patch
-------------------------------------------------------------------
Wed Mar 29 13:53:04 UTC 2017 - jmatejek@suse.com
- uninstall alternatives in %postun
-------------------------------------------------------------------
Wed Mar 29 11:59:27 UTC 2017 - tbechtold@suse.com
- Fix Source url
-------------------------------------------------------------------
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

11
python-pbr.spec
View File

@@ -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 @@ 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
@@ -91,7 +90,7 @@ mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-%{$python_bin_suffix}
%post
%python_install_alternative pbr
%preun
%postun
%python_uninstall_alternative pbr
%files %{python_files}