[python-ceilometerclient] Update to upstream version 1.0.1.

Jakub Ruzicka jruzicka at fedoraproject.org
Tue Jul 16 16:30:00 UTC 2013


commit e02e95be2deea6af042900c7343f51cfd94ab6cd
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Mon Jul 15 16:00:23 2013 +0200

    Update to upstream version 1.0.1.

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |   25 ++++++++++++++
 python-ceilometerclient.spec                       |   34 ++++++++++----------
 sources                                            |    2 +-
 4 files changed, 44 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9718c0..9800cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /0.0.10.d84fd99.tar.gz
 /python-ceilometerclient-1.0.0.tar.gz
+/python-ceilometerclient-1.0.1.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
new file mode 100644
index 0000000..2e1800f
--- /dev/null
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -0,0 +1,25 @@
+From d3d977d294386bc3e1072c740bcd20ff2573bfaa 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 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/ceilometerclient/__init__.py b/ceilometerclient/__init__.py
+index d6efb69..b73e453 100644
+--- a/ceilometerclient/__init__.py
++++ b/ceilometerclient/__init__.py
+@@ -12,10 +12,4 @@
+ 
+ __all__ = ['__version__']
+ 
+-import pbr.version
+-
+-version_info = pbr.version.VersionInfo('python-ceilometerclient')
+-try:
+-    __version__ = version_info.version_string()
+-except AttributeError:
+-    __version__ = None
++__version__ = "REDHATCEILOMETERCLIENTVERSION"
diff --git a/python-ceilometerclient.spec b/python-ceilometerclient.spec
index eb954d1..e4999cc 100644
--- a/python-ceilometerclient.spec
+++ b/python-ceilometerclient.spec
@@ -1,5 +1,5 @@
 Name:             python-ceilometerclient
-Version:          1.0.0
+Version:          1.0.1
 Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Ceilometer
 
@@ -14,14 +14,14 @@ BuildRequires:    python2-devel
 
 Requires:         python-setuptools
 Requires:         python-argparse
-Requires:         python-prettytable >= 0.6
-Requires:         python-prettytable < 0.7
-Requires:         python-iso8601 >= 0.1.4
-Requires:         python-keystoneclient >= 0.1.2
+Requires:         python-prettytable
+Requires:         python-iso8601
+Requires:         python-keystoneclient
 
 #
-# patches_base=0.0.10.d84fd99
+# patches_base=1.0.1
 #
+Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
 
 %description
 This is a client library for Ceilometer built on the Ceilometer API. It
@@ -46,16 +46,13 @@ This package contains auto-generated documentation.
 %prep
 %setup -q
 
-# Remove bundled egg-info.
-rm -rf python_novaclient.egg-info
+%patch0001 -p1
 
-# Let RPM handle deps.
-# TODO: Have the following handle multi line entries.
-sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
-
-# MANIFEST.in contains mostly non-existent files, delete it.
-rm -f 'MANIFEST.in'
+# Remove the requirements file so that pbr hooks don't add it
+# to distutils requiers_dist config.
+rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 
+sed -i s/REDHATCEILOMETERCLIENTVERSION/%{version}/ ceilometerclient/__init__.py
 
 %build
 %{__python} setup.py build
@@ -63,9 +60,6 @@ rm -f 'MANIFEST.in'
 %install
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-# Delete tests
-rm -rf %{buildroot}%{python_sitelib}/tests
-
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 sphinx-build -b html doc/source html
 
@@ -83,6 +77,12 @@ rm -rf html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Tue Jul 16 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.1-1
+- Update to upstream version 1.0.1.
+- Remove new runtime dependency on python-pbr.
+- Remove requirements file.
+- Make requires generic instead of requiring specific versions.
+
 * Mon Apr 01 2013 Jakub Ruzicka <jruzicka at redhat.com> 1.0.0
 - Update to upstream version 1.0.0.
 - Added Requires: python-keystoneclient >= 0.1.2.
diff --git a/sources b/sources
index 549ff24..3baa018 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d300d8c4dc020b4f9a1f521cbb8d0102  python-ceilometerclient-1.0.0.tar.gz
+9cc887e85bc0a1aec244894c69920573  python-ceilometerclient-1.0.1.tar.gz


More information about the scm-commits mailing list