Merge lp:~james-page/ceilometer/grizzly-tidyup into lp:~openstack-ubuntu-testing/ceilometer/grizzly

[James Page]

General tidy of package in preparation for Grizzly rc1

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-11 15:40:24 +0000
+++ debian/changelog	2013-03-11 22:44:20 +0000
@@ -4,34 +4,39 @@
   * New upstream release. 
   * debian/watch: point to the right releases.
   * debian/rules: Enable testsuite.
-  * debian/control: Update dependencies.
-  * debian/patches/remove-unwanted-dependencies.patch: Remove mongodb dependencies.
   * debian/ceilometer-agent-compute.postinst: Add smarts to 
     configure users after install.
   * debian/ceilometer-common.postinst: Configure ceilometer db.
   * debian/ceilometer-common.install: Install configuration files.
-  * debian/*.usptart: Update and use start-stop-daemon.
-  * debian/patches/exclude-tests-when-isntall.patch: Exclude tests so it
-    doesnt conflict with python-boto (LP: #1102110)
+  * debian/*.upstart: Update and use start-stop-daemon.
 
   [ James Page ]
   * Added watch file.
+  * d/rules: Fixup test suite execution as much as possible:
+    - Set PYTHONPATH to CURDIR during execution.
+    - Provide HOME directory for keystone tests.
+    - Override clean to tidy up after execution.
+  * d/control: Tidied BD's:
+    - Drop python-ming (not the right ming).
+    - python-oslo-config -> python-oslo.config.
+    - Dropped misc other surplus/duplicate dependencies.
+    - Wrapped and sorted.
+  * d/p/request-dep.patch: Remove upper bound on python-requests inline with
+    the rest of OpenStack.
+  * d/p/remove-hbase-support.patch: Remove happybase dependency.
+  * d/control: Bumped Standards-Version, no changes.
 
   [ Yolanda Robla ]
-  * d/patches: removed unused patches
-  * d/rules: copying ceilometer.conf.sample to ceilometer.conf
-  * d/ceilometer-common.install: fix copying ceilometer.conf, copy ceilometer-dbsync
-  * d/ceilometer-common.postinst: configuring mongo connection by default,
-  * fixing user/group creation
-  * d/control: updated dependencies
-  * d/*.upstart: fixed upstart jobs
-  * d/pydist-overrides: correcting pymongo and wsme package names
-  * d/control: moved mongo recommends to api and collector
-    packages (LP: #1131627)
-  * d/control: refreshed dependencies
-  * d/files: copying pipeline.yaml
-  * d/control: fixed typo (LP: #1140309)
-  * debian/patches/exclude-tests-when-installing.patch: removed, not needed
+  * d/rules: Copy ceilometer.conf.sample to ceilometer.conf.
+  * d/ceilometer-common.install: Install ceilometer.conf and ceilometer-dbsync.
+  * d/ceilometer-common.postinst: Configure mongo connection by default,
+    fixing user/group creation.
+  * d/*.upstart: Fix upstart jobs.
+  * d/pydist-overrides: Correct pymongo and wsme package names.
+  * d/control: moved mongodb recommends to api and collector
+    packages (LP: #1131627).
+  * d/files: copying pipeline.yaml.
+  * d/control: fixed typo (LP: #1140309).
 
  -- Yolanda Robla <[e-mail]>  Mon, 11 Mar 2013 14:23:00 +0100
 
 
=== modified file 'debian/control'
--- debian/control	2013-03-04 14:20:41 +0000
+++ debian/control	2013-03-11 22:44:20 +0000
@@ -2,64 +2,55 @@
 Section: python
 Priority: optional
 Maintainer: Chuck Short <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends:
+ debhelper (>= 8.0.0),
  python-all (>= 2.6),
- python-all-dev (>=  2.6.6-3~)
-Build-Depends-Indep:
  python-nose,
- python-unittest2,
+ python-anyjson (>= 0.2.4),
+ python-argparse,
+ python-babel (>= 0.9.6),
  python-coverage,
- python-mock,
- python-mox,
- python-babel (>= 0.9.6),
- python-ming,
- python-nova,
- python-glance,
- python-swift,
- python-setuptools-git (>= 0.4),
- python-netifaces,
- python-sphinx,
  python-docutils,
- python-oslo-config,
- python-yaml,
- python-flask (>= 0.9)
-Depends:
- python-webob (>= 1.2),
+ python-eventlet,
+ python-extras,
+ python-flask (>= 0.9),
+ python-glanceclient,
+ python-iso8601,
+ python-keystoneclient (<< 1:0.3),
  python-kombu,
- python-iso8601,
  python-lockfile,
+ python-lxml,
+ python-migrate,
+ python-mock,
+ python-mox,
  python-netaddr,
- python-argparse,
- python-sqlalchemy (<= 0.7.9),
- python-migrate,
+ python-netifaces,
+ python-novaclient (>= 2.6.10),
+ python-oslo.config,
+ python-pecan (>= 0.2.0),
  python-pymongo (>= 2.2),
- python-eventlet,
- python-anyjson (>= 0.2.4),
- python-flask (>= 0.9),
- python-pecan (>= 0.2.0),
+ python-requests,
+ python-setuptools-git (>= 0.4),
+ python-sphinx,
+ python-sqlalchemy,
  python-stevedore (>= 0.6),
- python-glanceclient,
- python-novaclient (>= 2.6.10),
- python-keystoneclient (<< 0.3),
+ python-swift,
  python-swiftclient,
- python-lxml,
- python-requests,
- python-extras,
+ python-unittest2,
+ python-webob (>= 1.2),
  python-wsme (>= 0.5b1),
- python-pyyaml,
- python-oslo-config
-Standards-Version: 3.9.3
+ python-yaml
+Standards-Version: 3.9.4
 
 Package: python-ceilometer
 Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Description: ceilometer python libraries
- 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 
+ 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.
  .
  (A ceilometer is an instrument that measures cloud coverage.)
@@ -69,14 +60,18 @@
 
 Package: ceilometer-common
 Architecture: all
-Depends: python-ceilometer (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, adduser
+Depends:
+ adduser,
+ python-ceilometer (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Provides: ${python:Provides}
 Description: ceilometer common files
  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 
+ 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.
  .
  (A ceilometer is an instrument that measures cloud coverage.)
@@ -85,14 +80,17 @@
 
 Package: ceilometer-collector
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Recommends: mongodb
 Description: ceilometer collector service
  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 
+ 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.
  .
  (A ceilometer is an instrument that measures cloud coverage.)
@@ -101,27 +99,33 @@
 
 Package: ceilometer-api
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Recommends: mongodb
 Description: ceilometer api service
  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 
+ 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 package contains the api service
 
 Package: ceilometer-agent-compute
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Description: ceilometer compute agent
  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 
+ 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.
  .
  (A ceilometer is an instrument that measures cloud coverage.)
@@ -130,13 +134,16 @@
 
 Package: ceilometer-agent-central
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
 Description: ceilometer central agent
  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 
+ 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.
  .
  (A ceilometer is an instrument that measures cloud coverage.)
 
=== added directory 'debian/patches'
=== added file 'debian/patches/remove-hbase-support.patch'
--- debian/patches/remove-hbase-support.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-hbase-support.patch	2013-03-11 22:44:20 +0000
@@ -0,0 +1,13 @@
+Description: Drop unpackaged happybase from dependencies
+ This avoids breaking stevedore extensions via endpoints.
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -25,4 +25,4 @@ extras
+ wsme>=0.5b1
+ pyyaml
+ http://tarballs.openstack.org/oslo-config/oslo.config-1.1.0b1.tar.gz#egg=oslo.config
+-happybase>=0.4
++#happybase>=0.4
 
=== added file 'debian/patches/requests-dep.patch'
--- debian/patches/requests-dep.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/requests-dep.patch	2013-03-11 22:44:20 +0000
@@ -0,0 +1,15 @@
+Description: Remove upper bound on requests
+Author: James Page <[e-mail]>
+Forwarded: no
+
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -20,7 +20,7 @@ python-novaclient>=2.6.10
+ http://tarballs.openstack.org/python-keystoneclient/python-keystoneclient-master.tar.gz#egg=python-keystoneclient
+ python-swiftclient
+ lxml
+-requests<1.0
++requests
+ extras
+ wsme>=0.5b1
+ pyyaml
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-03-11 22:44:20 +0000
@@ -0,0 +1,2 @@
+remove-hbase-support.patch
+requests-dep.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-01-17 17:45:41 +0000
+++ debian/rules	2013-03-11 22:44:20 +0000
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export HOME="$(CURDIR)/debian/test"
+
 %:
 	dh $@  --with python2
 
@@ -11,9 +13,15 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	nosetests || true
+	mkdir -p ${HOME}
+	PYTHONPATH=$(CURDIR) nosetests || true
 endif
 
 override_dh_install:
 	cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
 	dh_install
+
+override_dh_auto_clean:
+	rm -f etc/ceilometer/ceilometer.conf
+	rm -f ${HOME}
+	dh_auto_clean