From 3049f2e7b9eeda56095928ac465516f0f7f7f56cdccae27a68b962065b7d0793 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Tue, 11 Aug 2015 08:09:57 +0000 Subject: [PATCH 1/4] Accepting request 321796 from home:seife:OpenStack:Master update to version 1.4.0 OBS-URL: https://build.opensuse.org/request/show/321796 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=38 --- pbr-1.3.0.tar.gz | 3 --- pbr-1.4.0.tar.gz | 3 +++ python-pbr-doc.changes | 11 +++++++++++ python-pbr-doc.spec | 2 +- python-pbr.changes | 11 +++++++++++ python-pbr.spec | 5 +++-- 6 files changed, 29 insertions(+), 6 deletions(-) delete mode 100644 pbr-1.3.0.tar.gz create mode 100644 pbr-1.4.0.tar.gz diff --git a/pbr-1.3.0.tar.gz b/pbr-1.3.0.tar.gz deleted file mode 100644 index afdb55f..0000000 --- a/pbr-1.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a6f8d514fc11d2571c75c207d932c106f024f199b5f12d25f8ca022b026c59d -size 99701 diff --git a/pbr-1.4.0.tar.gz b/pbr-1.4.0.tar.gz new file mode 100644 index 0000000..9bbbe14 --- /dev/null +++ b/pbr-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f080232fb6b208615b4c1854bf4277bb097d19c9ef89f94f203c1436fe600e92 +size 102181 diff --git a/python-pbr-doc.changes b/python-pbr-doc.changes index ab9093a..2ab867e 100644 --- a/python-pbr-doc.changes +++ b/python-pbr-doc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com + +- update to version 1.4.0 + * Fix docs for environment markers in extras + * Export ChangeLog and AUTHORS in install + * Show how long the git querying takes + * Add wsgi_scripts support to PBR + * Updated from global requirements +- requires python-mock >= 1.2 + ------------------------------------------------------------------- Mon Aug 3 09:46:34 UTC 2015 - toddrme2178@gmail.com diff --git a/python-pbr-doc.spec b/python-pbr-doc.spec index b4459b3..42c12d1 100644 --- a/python-pbr-doc.spec +++ b/python-pbr-doc.spec @@ -17,7 +17,7 @@ Name: python-pbr-doc -Version: 1.3.0 +Version: 1.4.0 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 diff --git a/python-pbr.changes b/python-pbr.changes index fdddeee..8389b11 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com + +- update to version 1.4.0 + * Fix docs for environment markers in extras + * Export ChangeLog and AUTHORS in install + * Show how long the git querying takes + * Add wsgi_scripts support to PBR + * Updated from global requirements +- requires python-mock >= 1.2 + ------------------------------------------------------------------- Mon Aug 3 10:04:09 UTC 2015 - toddrme2178@gmail.com diff --git a/python-pbr.spec b/python-pbr.spec index 80ab34d..370344a 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 1.3.0 +Version: 1.4.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -33,6 +33,7 @@ Source1: python-pbr-rpmlintrc # needed to be abe to use pbr with newer Sphinx versions Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch BuildRequires: fdupes +BuildRequires: git BuildRequires: python-devel BuildRequires: python-pip >= 1.4 # Test requirements: @@ -43,7 +44,7 @@ BuildRequires: python-discover %endif BuildRequires: python-fixtures >= 0.3.14 BuildRequires: python-hacking >= 0.9.2 -BuildRequires: python-mock >= 1.0 +BuildRequires: python-mock >= 1.2 BuildRequires: python-python-subunit >= 0.0.18 BuildRequires: python-testrepository >= 0.0.18 BuildRequires: python-testresources >= 0.2.4 From b3e679149aae65ac24382a4e8163d405e13c1832a7e063a77c2664fcf4c3b5a2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 12 Aug 2015 09:34:08 +0000 Subject: [PATCH 2/4] - add 0001-Handle-git-being-entirely-absent.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=39 --- 0001-Handle-git-being-entirely-absent.patch | 46 +++++++++++++++++++++ python-pbr.changes | 5 +++ python-pbr.spec | 2 + 3 files changed, 53 insertions(+) create mode 100644 0001-Handle-git-being-entirely-absent.patch diff --git a/0001-Handle-git-being-entirely-absent.patch b/0001-Handle-git-being-entirely-absent.patch new file mode 100644 index 0000000..475d84f --- /dev/null +++ b/0001-Handle-git-being-entirely-absent.patch @@ -0,0 +1,46 @@ +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/python-pbr.changes b/python-pbr.changes index 8389b11..11bfbd1 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 12 09:32:35 UTC 2015 - dmueller@suse.com + +- add 0001-Handle-git-being-entirely-absent.patch + ------------------------------------------------------------------- Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com diff --git a/python-pbr.spec b/python-pbr.spec index 370344a..259213c 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -32,6 +32,7 @@ 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: git BuildRequires: python-devel @@ -71,6 +72,7 @@ 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 From 3d34f6552df3fab706275cd13de45c472316b8ab23c19c9e30017dcbd30f52bd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 12 Aug 2015 09:34:29 +0000 Subject: [PATCH 3/4] - add 0001-Handle-git-being-entirely-absent.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=40 --- python-pbr.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pbr.changes b/python-pbr.changes index 11bfbd1..50a10db 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Aug 12 09:32:35 UTC 2015 - dmueller@suse.com -- add 0001-Handle-git-being-entirely-absent.patch +- add 0001-Handle-git-being-entirely-absent.patch ------------------------------------------------------------------- Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com From afce122c082a73ce6640ed7f9e8b43004666082f65a70093e20b567d1f664b60 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 12 Aug 2015 09:39:37 +0000 Subject: [PATCH 4/4] - revert dependency on git (see comment in the specfile) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=41 --- python-pbr.changes | 1 + python-pbr.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pbr.changes b/python-pbr.changes index 50a10db..53d53cb 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -2,6 +2,7 @@ Wed Aug 12 09:32:35 UTC 2015 - dmueller@suse.com - add 0001-Handle-git-being-entirely-absent.patch +- revert dependency on git (see comment in the specfile) ------------------------------------------------------------------- Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com diff --git a/python-pbr.spec b/python-pbr.spec index 259213c..8f97249 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -34,7 +34,6 @@ Source1: python-pbr-rpmlintrc Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch Patch1: 0001-Handle-git-being-entirely-absent.patch BuildRequires: fdupes -BuildRequires: git BuildRequires: python-devel BuildRequires: python-pip >= 1.4 # Test requirements: