Accepting request 322053 from devel:languages:python
- 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 - add 0001-Handle-git-being-entirely-absent.patch - revert dependency on git (see comment in the specfile) - 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 OBS-URL: https://build.opensuse.org/request/show/322053 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pbr?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c1575e4ac9
46
0001-Handle-git-being-entirely-absent.patch
Normal file
46
0001-Handle-git-being-entirely-absent.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From 5c0bb9186fe2d65901744b00af24c8c50b3e1d29 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Collins <rbtcollins@hp.com>
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1a6f8d514fc11d2571c75c207d932c106f024f199b5f12d25f8ca022b026c59d
|
||||
size 99701
|
||||
3
pbr-1.4.0.tar.gz
Normal file
3
pbr-1.4.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f080232fb6b208615b4c1854bf4277bb097d19c9ef89f94f203c1436fe600e92
|
||||
size 102181
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
|
||||
@ -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
|
||||
@ -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: python-devel
|
||||
BuildRequires: python-pip >= 1.4
|
||||
@ -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
|
||||
@ -70,6 +71,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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user