From a5f08ed8d91c79d2c2b86093161b2d4fcf36de17a0aa86554bff476cf556583a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 26 Aug 2015 15:47:05 +0000 Subject: [PATCH] Accepting request 326694 from Cloud:OpenStack:Master - update to 1.6.0: * Strip comments in requirements files * Handle git being entirely absent * We require the use of setuptools * Fix retrieval of commit data and most recent tag - update to 1.6.0: * Strip comments in requirements files * Handle git being entirely absent * We require the use of setuptools * Fix retrieval of commit data and most recent tag - Remove 0001-Handle-git-being-entirely-absent.patch . Applied upstream OBS-URL: https://build.opensuse.org/request/show/326694 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=43 --- 0001-Handle-git-being-entirely-absent.patch | 46 --------------------- pbr-1.4.0.tar.gz | 3 -- pbr-1.6.0.tar.gz | 3 ++ python-pbr-doc.changes | 9 ++++ python-pbr-doc.spec | 2 +- python-pbr.changes | 11 +++++ python-pbr.spec | 4 +- 7 files changed, 25 insertions(+), 53 deletions(-) delete mode 100644 0001-Handle-git-being-entirely-absent.patch delete mode 100644 pbr-1.4.0.tar.gz create mode 100644 pbr-1.6.0.tar.gz diff --git a/0001-Handle-git-being-entirely-absent.patch b/0001-Handle-git-being-entirely-absent.patch deleted file mode 100644 index 475d84f..0000000 --- a/0001-Handle-git-being-entirely-absent.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5c0bb9186fe2d65901744b00af24c8c50b3e1d29 Mon Sep 17 00:00:00 2001 -From: Robert Collins -Date: Mon, 10 Aug 2015 16:22:26 +1200 -Subject: [PATCH] Handle git being entirely absent - -When we try to find the git directory, if git is not present, treat -that the same as an error from git itself. Sadly tests for this are -nearly impossible to meaningfully write, since we always have git -installed. I can do a mock based test if folk want one. - -Change-Id: If6160d1fb3def8133bdd0b66105e60ef93f80f82 -Closes-Bug: #1481468 ---- - pbr/git.py | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/pbr/git.py b/pbr/git.py -index b4ae300..60acd3c 100644 ---- a/pbr/git.py -+++ b/pbr/git.py -@@ -18,6 +18,7 @@ from __future__ import unicode_literals - - import distutils.errors - from distutils import log -+import errno - import io - import os - import re -@@ -64,7 +65,13 @@ def _run_git_command(cmd, git_dir, **kwargs): - - - def _get_git_directory(): -- return _run_shell_command(['git', 'rev-parse', '--git-dir']) -+ try: -+ return _run_shell_command(['git', 'rev-parse', '--git-dir']) -+ except OSError as e: -+ if e.errno == errno.ENOENT: -+ # git not installed. -+ return '' -+ raise - - - def _git_is_installed(): --- -2.4.6 - diff --git a/pbr-1.4.0.tar.gz b/pbr-1.4.0.tar.gz deleted file mode 100644 index 9bbbe14..0000000 --- a/pbr-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f080232fb6b208615b4c1854bf4277bb097d19c9ef89f94f203c1436fe600e92 -size 102181 diff --git a/pbr-1.6.0.tar.gz b/pbr-1.6.0.tar.gz new file mode 100644 index 0000000..a865398 --- /dev/null +++ b/pbr-1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1 +size 99945 diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes index 2ab867e..53f26e4 100644 --- a/python-pbr-doc.changes +++ b/python-pbr-doc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com + +- update to 1.6.0: + * Strip comments in requirements files + * Handle git being entirely absent + * We require the use of setuptools + * Fix retrieval of commit data and most recent tag + ------------------------------------------------------------------- Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index 42c12d1..c7c03e4 100644 --- a/python-pbr-doc.spec +++ b/python-pbr-doc.spec @@ -17,7 +17,7 @@ Name: python-pbr-doc -Version: 1.4.0 +Version: 1.6.0 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 diff --git a/python-pbr.changes b/python-pbr.changes index 53d53cb..fa79cdf 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com + +- update to 1.6.0: + * Strip comments in requirements files + * Handle git being entirely absent + * We require the use of setuptools + * Fix retrieval of commit data and most recent tag +- Remove 0001-Handle-git-being-entirely-absent.patch . + Applied upstream + ------------------------------------------------------------------- Wed Aug 12 09:32:35 UTC 2015 - dmueller@suse.com diff --git a/python-pbr.spec b/python-pbr.spec index 8f97249..d9b6cab 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 1.4.0 +Version: 1.6.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -32,7 +32,6 @@ Source1: python-pbr-rpmlintrc # NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/ # needed to be abe to use pbr with newer Sphinx versions Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch -Patch1: 0001-Handle-git-being-entirely-absent.patch BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4 @@ -71,7 +70,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