--- a/components/python/ceilometerclient/Makefile Wed Sep 07 14:48:36 2016 -0700
+++ b/components/python/ceilometerclient/Makefile Wed Sep 07 14:48:36 2016 -0700
@@ -26,16 +26,17 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= python-ceilometerclient
-COMPONENT_VERSION= 1.1.1
+COMPONENT_VERSION= 2.4.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:f48e2d9ecef25ab784510fa0b299d0d73aa8f41652abf9f28393a93612416a29
+ sha256:0cb0346ea53b110f10df1e3978e2ff031777b0e70a3100d1a216aca2ea4e8f73
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= http://launchpad.net/python-ceilometerclient
+COMPONENT_PROJECT_URL= \
+ http://docs.openstack.org/developer/python-ceilometerclient/
COMPONENT_BUGDB= service/ceilometer
-TPNO= 25749
+TPNO= 29185
# Depends on keystoneclient which is not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
@@ -55,9 +56,8 @@
install: $(INSTALL_NO_ARCH)
-# tests require:
-# hacking, discover, fixtures, python-subunit, sphinx, testrepository
-# and testtools, some of which have not been integrated.
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
+# required to execute unittests.
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
--- a/components/python/ceilometerclient/ceilometerclient-PYVER.p5m Wed Sep 07 14:48:36 2016 -0700
+++ b/components/python/ceilometerclient/ceilometerclient-PYVER.p5m Wed Sep 07 14:48:36 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -61,15 +61,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/fake_client.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/utils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/cliutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/uuidutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/shell.py
-file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/meters.py
-file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/shell.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/alarms.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/capabilities.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/event_types.py
file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/events.py
@@ -93,24 +88,30 @@
#
license LICENSE license="Apache v2.0"
+# force a group dependency on the optional oslo.i18n; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/oslo.i18n-$(PYV)
+
# force a group dependency on the optional simplejson; pkgdepend work is needed
# to flush this out.
depend type=group fmri=library/python/simplejson-$(PYV)
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/babel-$(PYV)
-
# force a dependency on the ceilometerclient package
depend type=require \
fmri=library/python/ceilometerclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+# force a dependency on keystoneauth1; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/keystoneauth1-$(PYV)
+
# force a dependency on keystoneclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/keystoneclient-$(PYV)
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
+depend type=require fmri=library/python/oslo.serialization-$(PYV)
+
# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.utils-$(PYV)
--- a/components/python/ceilometerclient/patches/01-requirements.patch Wed Sep 07 14:48:36 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-In-house patch to remove the dependency on argparse. Since we use
-Python 2.7 only for OpenStack, argparse is already included. If this
-line is present, stevedore will fail to find the pip package for it,
-causing a cascade of failures to other tools.
-
---- python-ceilometerclient-1.1.1/requirements.txt.orig 2015-10-19 21:22:33.907035765 -0400
-+++ python-ceilometerclient-1.1.1/requirements.txt 2015-10-19 21:23:51.056610220 -0400
-@@ -2,7 +2,6 @@
- # of appearance. Changing the order has an impact on the overall integration
- # process, which may cause wedges in the gate later.
- pbr!=0.7,<1.0,>=0.6
--argparse
- iso8601>=0.1.9
- oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
- oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
---- python-ceilometerclient-1.1.1/python_ceilometerclient.egg-info/requires.txt.orig 2015-10-19 21:23:12.458006696 -0400
-+++ python-ceilometerclient-1.1.1/python_ceilometerclient.egg-info/requires.txt 2015-10-19 21:24:00.200036509 -0400
-@@ -1,5 +1,4 @@
- pbr!=0.7,<1.0,>=0.6
--argparse
- iso8601>=0.1.9
- oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
- oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0