[python-ceilometerclient] Update to upstream 1.0.10
Jakub Ruzicka
jruzicka at fedoraproject.org
Thu Jun 5 17:59:13 UTC 2014
commit df31fbdfabbbfcf1576ea52edc1f6ab58ae57640
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date: Thu Jun 5 18:29:44 2014 +0200
Update to upstream 1.0.10
Changelog:
- Update to upstream 1.0.10
- Remove requirements.txt in .spec instead of patch
.gitignore | 1 +
0001-Remove-runtime-dependency-on-python-pbr.patch | 38 ++-----------------
python-ceilometerclient.spec | 17 +++++++--
sources | 2 +-
4 files changed, 20 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0570f55..0b6a021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/python-ceilometerclient-1.0.6.tar.gz
/python-ceilometerclient-1.0.8.tar.gz
/python-ceilometerclient-1.0.9.tar.gz
+/python-ceilometerclient-1.0.10.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index a58625d..5dcd2d2 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,14 +1,12 @@
-From 92df12c9c66859bcd8f63d7194620779e1a24aa1 Mon Sep 17 00:00:00 2001
+From 607ca7507123aeb0ccb97183b44defe457ecb23f Mon Sep 17 00:00:00 2001
From: Jakub Ruzicka <jruzicka at redhat.com>
Date: Tue, 16 Jul 2013 18:09:30 +0200
Subject: [PATCH] Remove runtime dependency on python-pbr
---
- ceilometerclient/__init__.py | 8 +-------
- requirements.txt | 7 +------
- setup.py | 1 -
- test-requirements.txt | 11 +----------
- 4 files changed, 3 insertions(+), 24 deletions(-)
+ ceilometerclient/__init__.py | 8 +-------
+ setup.py | 1 -
+ 2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/ceilometerclient/__init__.py b/ceilometerclient/__init__.py
index d6efb69..b73e453 100644
@@ -26,18 +24,6 @@ index d6efb69..b73e453 100644
-except AttributeError:
- __version__ = None
+__version__ = "REDHATCEILOMETERCLIENTVERSION"
-diff --git a/requirements.txt b/requirements.txt
-index 1f33a82..a645177 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1 @@
--pbr>=0.5.21,<1.0
--argparse
--iso8601>=0.1.8
--PrettyTable>=0.7,<0.8
--python-keystoneclient>=0.4.1
--six>=1.4.1
-+# let RPM handle deps
diff --git a/setup.py b/setup.py
index 70c2b3f..afab729 100644
--- a/setup.py
@@ -48,19 +34,3 @@ index 70c2b3f..afab729 100644
setuptools.setup(
- setup_requires=['pbr'],
pbr=True)
-diff --git a/test-requirements.txt b/test-requirements.txt
-index c082bec..a645177 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -1,10 +1 @@
--# Hacking already pins down pep8, pyflakes and flake8
--hacking>=0.8.0,<0.9
--coverage>=3.6
--discover
--fixtures>=0.3.14
--mock>=1.0
--python-subunit
--sphinx>=1.1.2,<1.2
--testrepository>=0.0.17
--testtools>=0.9.32
-+# let RPM handle deps
diff --git a/python-ceilometerclient.spec b/python-ceilometerclient.spec
index 4545833..aa88de8 100644
--- a/python-ceilometerclient.spec
+++ b/python-ceilometerclient.spec
@@ -1,6 +1,6 @@
Name: python-ceilometerclient
-Version: 1.0.9
-Release: 3%{?dist}
+Version: 1.0.10
+Release: 1%{?dist}
Summary: Python API and CLI for OpenStack Ceilometer
Group: Development/Languages
@@ -22,7 +22,7 @@ Requires: python-keystoneclient
Requires: python-six >= 1.4.1
#
-# patches_base=1.0.9
+# patches_base=1.0.10
#
Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -51,8 +51,15 @@ This package contains auto-generated documentation.
%patch0001 -p1
+# We provide version like this in order to remove runtime dep on pbr.
sed -i s/REDHATCEILOMETERCLIENTVERSION/%{version}/ ceilometerclient/__init__.py
+# Remove bundled egg-info
+rm -rf python_ceilometerclient.egg-info
+
+# Let RPM handle the requirements
+rm -f {,test-}requirements.txt
+
%build
%{__python} setup.py build
@@ -76,6 +83,10 @@ rm -rf html/.doctrees html/.buildinfo
%doc html
%changelog
+* Thu Jun 05 2014 Jakub Ruzicka <jruzicka at redhat.com> 1.0.10-1
+- Update to upstream 1.0.10
+- Remove requirements.txt in .spec instead of patch
+
* Mon Feb 17 2014 Pádraig Brady <pbrady at redhat.com> - 1.0.9-3
- Require python-six >= 1.4.1 to ensure update
diff --git a/sources b/sources
index c2f9582..3b3737b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3471498832947ab93c8a028e86f26b89 python-ceilometerclient-1.0.9.tar.gz
+5351dfb63df8c0084dee331b4f851a97 python-ceilometerclient-1.0.10.tar.gz
More information about the scm-commits
mailing list