python -c 'import ceilometerclient'
RES=$?
;;
+ python3-ceilometerclient)
+ python3 -c 'import ceilometerclient'
+ RES=$?
+ ;;
*)
echo "Test is not defined, skipping..."
;;
--- /dev/null
+commit 956259fbf8eb127e7548f04eb1ff18964c08444f
+Author: Angus Salkeld <asalkeld@redhat.com>
+Date: Fri Nov 30 15:10:42 2012 +1100
+
+ Revert "Remove the event class and use Meter instead."
+
+ Just rename Event to Sample
+
+ This reverts commit 46cedbcf1e0f7a329b8a895e1f97ca8b817dd319.
+
+commit 46cedbcf1e0f7a329b8a895e1f97ca8b817dd319
+Author: Angus Salkeld <asalkeld@redhat.com>
+Date: Fri Nov 30 13:31:47 2012 +1100
+
+ Remove the event class and use Meter instead.
+
+ Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
+
+commit 2ae6238fe974cfe983be68e69fd3d8846af063a2
+Author: Angus Salkeld <asalkeld@redhat.com>
+Date: Fri Nov 30 13:20:43 2012 +1100
+
+ Make sure the version is prepended
+
+ Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
+
+commit 16357a15abb38a70c94f829fdb3db8693b9c54ca
+Author: Angus Salkeld <asalkeld@redhat.com>
+Date: Fri Nov 30 13:20:21 2012 +1100
+
+ Fix the default service_type
+
+ Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
+
+commit 635bc921dbf0fe0c65d5ec84a6cd327e83550e40
+Author: Angus Salkeld <asalkeld@redhat.com>
+Date: Fri Nov 9 23:31:27 2012 +1100
+
+ Add basic functionality
+
+ Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
+
+commit 098f944eda406a2741c8d0f3546ea318421340bf
+Author: Angus Salkeld <asalkeld@redhat.com>
+Date: Fri Nov 9 12:52:21 2012 +1100
+
+ Initial Commit
+
+ Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
-python-ceilometerclient (1.0.14-1~u14.04+mos3) mos7.0; urgency=low
+python-ceilometerclient (1.4.0-1~u14.04+mos1) mos8.0; urgency=medium
- * Add dh-python to build dependencies
+ * Source: http://http.debian.net/debian/pool/main/p/python-ceilometerclient/python-ceilometerclient_1.5.0-1.dsc
+ * Package version is lowered to satisfy the code version in 8.0 branch.
- -- Ivan Berezovskiy <iberezovskiy@mirantis.com> Wed, 05 Aug 2015 16:11:57 +0300
+ -- Ivan Udovichenko <iudovichenko@mirantis.com> Fri, 25 Sep 2015 1:01:26 +0300
-python-ceilometerclient (1.0.14-1~u14.04+mos2) mos7.0; urgency=low
+python-ceilometerclient (1.5.0-1) experimental; urgency=medium
- * debian/control:
- - Add python-ceilometerclient-doc package section
- - Add python-oslosphinx to build dependencies
- * debian/rules:
- - Add sphinxdoc to build with
- - Add override_dh_sphinxdoc section
- * Remove debian/docs
- * Add debian/python-ceilometerclient.install
+ * New upstream release.
+ * Fixed (build-)depends for this release.
- -- Daniil Trishkin <dtrishkin@mirantis.com> Mon, 06 Jul 2015 17:03:18 +0300
+ -- Thomas Goirand <zigo@debian.org> Wed, 23 Sep 2015 18:37:59 +0200
-python-ceilometerclient (1.0.14-1~u14.04+mos1) mos7.0; urgency=low
+python-ceilometerclient (1.4.0-1) experimental; urgency=medium
- * Build python-ceilometerclient 1.0.14 for Kilo
- * Update requirements
- * Remove get-orig-source (Related-bug: #1461467)
- * Debian sources are based on:
- https://launchpad.net/ubuntu/+archive/primary/+files/python-ceilometerclient_1.0.13-0ubuntu1.debian.tar.xz
- and debian sources from openstack-ci/fuel-6.1/2014.2 branch
- commit b6c618a2d3b01e0705429d559927dd9ac6b704b0
+ * New upstream release.
+ * Fixed (build-)depends for this release.
- -- Ivan Berezovskiy <iberezovskiy@mirantis.com> Mon, 27 Apr 2015 20:05:38 +0300
+ -- Thomas Goirand <zigo@debian.org> Mon, 07 Sep 2015 14:42:58 +0200
-python-ceilometerclient (1.0.12-fuel6.1-14.04-2) trusty; urgency=low
+python-ceilometerclient (1.3.0-2) experimental; urgency=medium
- * Update requirements for current 1.0.12 tag
+ * Re-added missing changes from 1.2.0-2
- -- Ivan Berezovskiy <iberezovskiy@mirantis.com> Sun, 15 Mar 2015 19:53:35 +0300
+ -- Thomas Goirand <zigo@debian.org> Sun, 02 Aug 2015 16:16:00 +0000
-python-ceilometerclient (1.0.12-fuel6.1-14.04-1) trusty; urgency=low
+python-ceilometerclient (1.3.0-1) experimental; urgency=medium
- * Build python-ceilometerclient 1.0.12 for Ubuntu 14.04
- Updated version to 1.0.12
+ * New upstream release.
+ * Fixed (build-)depends for this release.
+ * Blacklist *test_client.ClientAuthTest.test_discover_auth_versions*
- -- Ivan Berezovskiy <iberezovskiy@mirantis.com> Wed, 18 Feb 2015 17:27:44 +0300
+ -- Thomas Goirand <zigo@debian.org> Sun, 02 Aug 2015 16:04:50 +0000
+python-ceilometerclient (1.2.0-2) experimental; urgency=medium
+
+ * Add autopkgtests from Ubuntu.
+
+ -- James Page <james.page@ubuntu.com> Wed, 08 Jul 2015 17:08:43 +0100
+
+python-ceilometerclient (1.2.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Updated (build-)depends for this release.
+ * Added Python 3 support.
+
+ -- Thomas Goirand <zigo@debian.org> Thu, 18 Jun 2015 15:09:57 +0200
+
+python-ceilometerclient (1.0.13-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Now generating the doc.
+
+ -- Thomas Goirand <zigo@debian.org> Wed, 15 Apr 2015 10:55:59 +0200
+
+python-ceilometerclient (1.0.10-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #741409).
+ * Updated (build-)depends for this release.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 03 May 2014 00:28:43 +0800
+
+python-ceilometerclient (1.0.9-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Reviewed (build-)dependencies and added missing "subunit" build-depends
+ (Closes: #743093).
+ * Disable man page build because it's failing in Wheezy backport.
+
+ -- Thomas Goirand <zigo@debian.org> Tue, 25 Mar 2014 15:16:04 +0800
+
+python-ceilometerclient (1.0.6-2) unstable; urgency=medium
+
+ * Fixed subunit output.
+ * Added python-ceilometerclient man page.
+ * Standards-Version: is now 3.9.5.
+
+ -- Thomas Goirand <zigo@debian.org> Sun, 16 Mar 2014 14:29:03 +0800
+
+python-ceilometerclient (1.0.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 05 Oct 2013 18:12:24 +0800
+
+python-ceilometerclient (1.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added --slowest --testr-args='--subunit ' when calling testr.
+
+ -- Thomas Goirand <zigo@debian.org> Tue, 01 Oct 2013 15:21:55 +0800
+
+python-ceilometerclient (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added missing build-depends: python-d2to1 (Closes: #724131).
+
+ -- Thomas Goirand <zigo@debian.org> Mon, 23 Sep 2013 10:08:10 +0800
+
+python-ceilometerclient (1.0.2-2) unstable; urgency=low
+
+ * Added missing build-depends: testrepository.
+
+ -- Thomas Goirand <zigo@debian.org> Sun, 28 Jul 2013 07:35:18 +0000
+
+python-ceilometerclient (1.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Ran wrap-and-sort.
+
+ -- Thomas Goirand <zigo@debian.org> Thu, 30 May 2013 13:40:55 +0800
+
+python-ceilometerclient (1.0.0-2) unstable; urgency=low
+
+ * Uploading to unstable.
+
+ -- Thomas Goirand <zigo@debian.org> Mon, 13 May 2013 09:05:24 +0000
+
+python-ceilometerclient (1.0.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org> Thu, 04 Apr 2013 23:35:35 +0800
+
+python-ceilometerclient (0~git+d740e376-1) experimental; urgency=low
+
+ * Initial release (Closes: #701064).
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 30 Nov 2012 17:15:12 +0000
Source: python-ceilometerclient
Section: python
Priority: extra
-Maintainer: MOS Ceilometer Team <mos-ceilometer@mirantis.com>
+Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
+Uploaders: Thomas Goirand <zigo@debian.org>,
Build-Depends: debhelper (>= 9),
- dh-python,
- python-all (>= 2.7.1),
- python-babel,
- python-coverage,
- python-fixtures (>= 0.3.14),
- python-subunit,
- python-setuptools,
- python-prettytable (>= 0.7),
- python-keystoneclient (>= 1:1.1.0),
- python-oslo.utils (>= 1.4.0),
- python-oslo.i18n (>= 1.5.0),
- python-oslo.serialization (>= 1.4.0),
- python-oslosphinx (>= 2.5.0),
- python-prettytable (>= 0.7),
- python-hacking,
- python-requests,
- python-stevedore (>= 1.3.0),
- python-httplib2,
- python-iso8601,
- python-pbr (>= 0.10),
- python-six (>= 1.9.0),
- python-mock,
- python-mox,
- python-sphinx (>= 1.1.2),
- testrepository (>= 0.0.18),
- python-testtools (>= 0.9.36)
-Standards-Version: 3.9.4
-Homepage: http://launchpad.net/ceilometer
+ dh-python,
+ openstack-pkg-tools,
+ python-all,
+ python-pbr (>= 1.8),
+ python-setuptools,
+ python-sphinx,
+ python3-all,
+ python3-pbr (>= 1.8),
+ python3-setuptools,
+Build-Depends-Indep: python-coverage,
+ python-fixtures,
+ python-hacking,
+ python-iso8601,
+ python-keystoneclient (>= 1:1.6.0),
+ python-mock,
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 2.0.0),
+ python-oslosphinx (>= 2.5.0),
+ python-prettytable,
+ python-requests (>= 2.5.2),
+ python-six (>= 1.9.0),
+ python-stevedore (>= 1.5.0),
+ python-tempest-lib (>= 0.5.0),
+ python-testtools,
+ python3-fixtures,
+ python3-iso8601,
+ python3-keystoneclient (>= 1:1.6.0),
+ python3-mock,
+ python3-oslo.i18n (>= 1.5.0),
+ python3-oslo.serialization (>= 1.4.0),
+ python3-oslo.utils (>= 2.0.0),
+ python3-prettytable,
+ python3-requests (>= 2.5.2),
+ python3-six (>= 1.9.0),
+ python3-stevedore (>= 1.5.0),
+ python3-subunit,
+ python3-tempest-lib (>= 0.5.0),
+ python3-testtools,
+ subunit,
+ testrepository,
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-ceilometerclient.git;a=summary
+Vcs-Git: git://anonscm.debian.org/openstack/python-ceilometerclient.git
+Homepage: http://www.openstack.org
XS-Testsuite: autopkgtest
Package: python-ceilometerclient
Architecture: all
-Depends:
- python-prettytable (>= 0.7),
- python-keystoneclient (>= 1:1.1.0),
- python-httplib2,
- python-iso8601 (>= 0.1.9),
- python-oslo.utils (>= 1.4.0),
- python-oslo.i18n (>= 1.5.0),
- python-oslo.serialization (>= 1.4.0),
- python-pbr (>= 0.10),
- python-requests (>= 2.2.0),
- python-six (>= 1.9.0),
- python-stevedore (>= 1.3.0),
- ${python:Depends},
- ${misc:Depends}
-Description: Client library for Openstack ceilometer server.
- This is a client library for Ceilometer built on the Ceilometer API.
- It provides a Python API (the ceilometerclient module) and
- a command-line tool (ceilometer).
+Depends: python-iso8601,
+ python-keystoneclient (>= 1:1.6.0),
+ python-oslo.i18n (>= 1.5.0),
+ python-oslo.serialization (>= 1.4.0),
+ python-oslo.utils (>= 2.0.0),
+ python-pbr (>= 1.8),
+ python-prettytable,
+ python-requests (>= 2.5.2),
+ python-six (>= 1.9.0),
+ python-stevedore (>= 1.5.0),
+ ${misc:Depends},
+ ${python:Depends},
+Suggests: python-ceilometerclient-doc
+Description: Client library for Openstack Ceilometer API server - Python 2.7
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must be
+ tracable and auditable, the counters must be easily extensible to support new
+ projects, and agents doing data collections should be independent of the
+ overall system.
+ .
+ This is a client for the Ceilometer which uses the OpenStack Image API.
+ There's a Python API (the "ceilometerclient" module), and a command-line
+ script ("ceilometer").
+ .
+ This package contains the Python 2.7 module.
-Package: python-ceilometerclient-doc
+Package: python3-ceilometerclient
Architecture: all
+Depends: python3-iso8601,
+ python3-keystoneclient (>= 1:1.6.0),
+ python3-oslo.i18n (>= 1.5.0),
+ python3-oslo.serialization (>= 1.4.0),
+ python3-oslo.utils (>= 2.0.0),
+ python3-pbr (>= 1.8),
+ python3-prettytable,
+ python3-requests (>= 2.5.2),
+ python3-six (>= 1.9.0),
+ python3-stevedore (>= 1.5.0),
+ ${misc:Depends},
+ ${python3:Depends},
+Suggests: python-ceilometerclient-doc
+Description: Client library for Openstack Ceilometer API server - Python 3.x
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must be
+ tracable and auditable, the counters must be easily extensible to support new
+ projects, and agents doing data collections should be independent of the
+ overall system.
+ .
+ This is a client for the Ceilometer which uses the OpenStack Image API.
+ There's a Python API (the "ceilometerclient" module), and a command-line
+ script ("ceilometer").
+ .
+ This package contains the Python 3.x module.
+
+Package: python-ceilometerclient-doc
Section: doc
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: Client library for Openstack ceilometer server.
- This is a client library for Ceilometer built on the Ceilometer API.
- It provides a Python API (the ceilometerclient module) and
- a command-line tool (ceilometer).
+Architecture: all
+Depends: ${misc:Depends},
+ ${sphinxdoc:Depends},
+Description: Client library for Openstack Ceilometer API server - doc
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must be
+ tracable and auditable, the counters must be easily extensible to support new
+ projects, and agents doing data collections should be independent of the
+ overall system.
+ .
+ This is a client for the Ceilometer which uses the OpenStack Image API.
+ There's a Python API (the "ceilometerclient" module), and a command-line
+ script ("ceilometer").
.
This package contains the documentation.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: python-ceilometerclient
-Source: http://github.com/openstack/python-ceilometerclient.git
+Source: git://github.com/asalkeld/python-ceilometerclient.git
+
+Files: debian/*
+Copyright: 2012 Thomas Goirand <zigo@debian.org>
+License: Apache-2
Files: *
-Copyright: 2012 OpenStack LLC
- 2013 Red Hat
- 2012-2013 Hewlett-Packard Development Company, L.P.
+Copyright: 2012, Openstack LLC
License: Apache-2
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian-based systems the full text of the Apache version 2.0 license
- can be found in `/usr/share/common-licenses/Apache-2.0'.
-Files: debian/*
-Copyright: 2013 Canonical Ltd
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
--- /dev/null
+[DEFAULT]
+upstream-branch = master
+debian-branch = debian/liberty
+upstream-tag = %(version)s
+compression = xz
+
+[buildpackage]
+export-dir = ../build-area/
+cleaner = true
argparse
+python-keystoneclient
+setuptools-git
+warlock
+distribute
--- /dev/null
+Document: python-ceilometerclient-doc
+Title: Python Ceilometer Client Documentation
+Author: OpenStack Foundation
+Abstract: Sphinx documentation for Python Ceilometer Client
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-ceilometerclient-doc/html/index.html
+Files: /usr/share/doc/python-ceilometerclient-doc/html/*
+++ /dev/null
-/usr/bin/*
-/usr/lib/*
\ No newline at end of file
--- /dev/null
+doc/man/ceilometer.1
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+ update-alternatives --install /usr/bin/ceilometer ceilometer /usr/bin/python2-ceilometer 300
+fi
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+ update-alternatives --remove ceilometer /usr/bin/python2-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+ update-alternatives --remove ceilometer /usr/bin/python2-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+ update-alternatives --install /usr/bin/ceilometer ceilometer /usr/bin/python3-ceilometer 200
+fi
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+ update-alternatives --remove ceilometer /usr/bin/python3-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
--- /dev/null
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+ update-alternatives --remove ceilometer /usr/bin/python3-ceilometer
+fi
+
+#DEBHELPER#
+
+exit 0
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
+
+MANIFEST_EXCLUDE_STANDARD := ceilometerclient
+
+include /usr/share/openstack-pkg-tools/pkgos.make
+
+export OSLO_PACKAGE_VERSION=$(VERSION)
%:
- dh $@ --with python2,sphinxdoc
+ dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
+
+override_dh_install:
+ set -e ; for pyvers in $(PYTHONS); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python-ceilometerclient; \
+ done
+ set -e ; for pyvers in $(PYTHON3S); do \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python3-ceilometerclient; \
+ done
+ mv $(CURDIR)/debian/python-ceilometerclient/usr/bin/ceilometer $(CURDIR)/debian/python-ceilometerclient/usr/bin/python2-ceilometer
+ mv $(CURDIR)/debian/python3-ceilometerclient/usr/bin/ceilometer $(CURDIR)/debian/python3-ceilometerclient/usr/bin/python3-ceilometer
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- testr init && testr run
+ @echo "===> Running tests"
+ set -e ; set -x ; for i in 2.7 3.4 ; do \
+ PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+ echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
+ rm -rf .testrepository ; \
+ testr-python$$PYMAJOR init ; \
+ TEMP_REZ=`mktemp -t` ; \
+ PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'ceilometerclient\.tests\.unit\.(?!.*test_client.ClientAuthTest\.test_discover_auth_versions.*)' | tee $$TEMP_REZ | subunit2pyunit ; \
+ cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+ rm -f $$TEMP_REZ ; \
+ testr-python$$PYMAJOR slowest ; \
+ done
endif
override_dh_sphinxdoc:
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
- python setup.py build_sphinx
- cp -rf doc/build/html $(CURDIR)/debian/python-ceilometerclient-doc/usr/share/doc/python-ceilometerclient-doc
+ sphinx-build -b html doc/source $(CURDIR)/debian/python-ceilometerclient-doc/usr/share/doc/python-ceilometerclient-doc/html
dh_sphinxdoc -O--buildsystem=python_distutils
-endif
\ No newline at end of file
+endif
+
+override_dh_clean:
+ dh_clean -O--buildsystem=python_distutils
+ rm -rf .testrepository
+ rm -rf doc/man
+
+override_dh_installman:
+#ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+# sphinx-build -b man doc/source doc/man
+# mv doc/man/python-ceilometerclient.1 doc/man/ceilometer.1
+# sed -i s/python-ceilometerclient/python-ceilometerclient/ doc/man/ceilometer.1
+# dh_installman -O--buildsystem=python_distutils
+#endif
--- /dev/null
+extend-diff-ignore = "^[^/]*[.]egg-info/"
--- /dev/null
+version=3
+https://github.com/openstack/python-ceilometerclient/tags .*/(\d[\d\.]+)\.tar\.gz
Code Review / openstack-build / python-ceilometerclient-build.git / commitdiff