hguemar pushed to python-troveclient (master). "Update to upstream 1.0.9"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 31 09:52:07 UTC 2015


>From 150edf5af5e84222eb882628292c635e3cb5350b Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Tue, 31 Mar 2015 10:45:08 +0200
Subject: Update to upstream 1.0.9


diff --git a/.gitignore b/.gitignore
index 49740bb..e6d7783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /python-troveclient-1.0.3.tar.gz
 /python-troveclient-1.0.5.tar.gz
 /python-troveclient-1.0.7.tar.gz
+/python-troveclient-1.0.9.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
deleted file mode 100644
index fc38226..0000000
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6d3b78207a45077e496bed4f7b43b93d41470480 Mon Sep 17 00:00:00 2001
-From: Jakub Ruzicka <jruzicka at redhat.com>
-Date: Mon, 16 Jun 2014 16:04:11 +0200
-Subject: [PATCH] Remove runtime dependency on python-pbr
-
----
- setup.py                |  1 -
- troveclient/__init__.py | 10 +---------
- 2 files changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 7363757..09230a0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -26,5 +26,4 @@ except ImportError:
-     pass
- 
- setuptools.setup(
--    setup_requires=['pbr'],
-     pbr=True)
-diff --git a/troveclient/__init__.py b/troveclient/__init__.py
-index a470d7b..65c0bac 100644
---- a/troveclient/__init__.py
-+++ b/troveclient/__init__.py
-@@ -16,12 +16,4 @@
- 
- __all__ = ['__version__']
- 
--import pbr.version
--
--version_info = pbr.version.VersionInfo('python-troveclient')
--# We have a circular import problem when we first run python setup.py sdist
--# It's harmless, so deflect it.
--try:
--    __version__ = version_info.version_string()
--except AttributeError:
--    __version__ = None
-+__version__ = "REDHATTROVECLIENTVERSION"
diff --git a/python-troveclient.spec b/python-troveclient.spec
index 0c5e911..a4625d5 100644
--- a/python-troveclient.spec
+++ b/python-troveclient.spec
@@ -1,5 +1,5 @@
 Name:           python-troveclient
-Version:        1.0.7
+Version:        1.0.9
 Release:        1%{?dist}
 Summary:        Client library for OpenStack DBaaS API
 
@@ -7,17 +7,19 @@ License:        ASL 2.0
 URL:            http://www.openstack.org/
 Source0:        https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
-Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
-
 BuildArch:      noarch
  
 BuildRequires:  python2-devel
+BuildRequires:  python-oslo-sphinx
 BuildRequires:  python-setuptools
 BuildRequires:  python-sphinx
 BuildRequires:  python-requests
 BuildRequires:  python-pbr
 
 Requires:       python-argparse
+Requires:       python-keystoneclient
+Requires:       python-oslo-utils
+Requires:       python-pbr
 Requires:       python-prettytable
 Requires:       python-requests
 Requires:       python-setuptools
@@ -47,11 +49,6 @@ implements 100% (or less ;) ) of the Trove API.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0001 -p1
-
-# We provide version like this in order to remove runtime dep on pbr
-sed -i s/REDHATTROVECLIENTVERSION/%{version}/ troveclient/__init__.py
-
 # Remove bundled egg-info
 rm -rf %{name}.egg-info
 
@@ -99,6 +96,9 @@ rm -rf html/.{doctrees,buildinfo}
 %{_bindir}/trove
 
 %changelog
+* Tue Mar 31 2015 Haikel Guemar <hguemar at fedoraproject.org> 1.0.9-1
+- Update to upstream 1.0.9
+
 * Mon Oct 13 2014 Jakub Ruzicka <jruzicka at redhat.com> 1.0.7-1
 - Update to upstream 1.0.7
 
diff --git a/sources b/sources
index 2c9c5d6..4878b7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-049583f4ba8c89aa29540184aadf871c  python-troveclient-1.0.7.tar.gz
+a2963b03179dca6a53309a47b7a2898f  python-troveclient-1.0.9.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-troveclient.git/commit/?h=master&id=150edf5af5e84222eb882628292c635e3cb5350b


More information about the scm-commits mailing list