Commit ef496a32 by Thomas Goirand

Some more Python 3 switch fixes.

parent e91c8e0b
ceilometer (1:10.0.0-2) experimental; urgency=medium
* Some more Python 3 switch fixes.
-- Thomas Goirand <zigo@debian.org> Thu, 22 Feb 2018 15:28:35 +0000
ceilometer (1:10.0.0-1) experimental; urgency=medium
[ Thomas Goirand ]
......
......@@ -28,7 +28,6 @@ Build-Depends-Indep:
python3-gabbi (>= 1.30.0),
python3-glanceclient (>= 1:2.0.0),
python3-gnocchiclient (>= 7.0.0),
python3-happybase,
python3-jsonpath-rw-ext (>= 0.1.9),
python3-keystoneauth1 (>= 2.1.0),
python3-keystoneclient (>= 1:1.6.0),
......@@ -249,7 +248,6 @@ Depends:
python3-glanceclient (>= 1:2.0.0),
python3-gnocchiclient (>= 7.0.0),
python3-greenlet,
python3-happybase,
python3-jsonpath-rw-ext (>= 0.1.9),
python3-keystoneauth1 (>= 2.1.0),
python3-keystoneclient (>= 1:1.6.0),
......
......@@ -12,15 +12,23 @@ override_dh_clean:
rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst
override_dh_auto_install:
echo "Do nothing here..."
echo "Do nothing..."
override_dh_auto_test:
echo "Do nothing..."
override_dh_install:
rm -rf $(CURDIR)/debian/tmp
python3 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/usr/etc
for i in $(PYTHON3S) ; do \
python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp ; \
done
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages bash -x ./debian/setup-test-env-mongodb.sh pkgos-dh_auto_test --no-py2 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*|.*meter\.test_notifications\.TestMeterProcessing\.test_fallback_meter_path.*|.*agent\.test_manager\.TestRunTasks\.test_batching_polled_samples_false.*))'
endif
rm -rf $(CURDIR)/debian/tmp/usr/etc
dh_install
dh_missing
dh_missing --fail-missing
# Manage ceilometer.conf
mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
......@@ -47,27 +55,14 @@ override_dh_install:
sed -i 's|#connection[ \t]*=.*|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
override_dh_auto_build:
dh_auto_build
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.config
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
override_dh_auto_clean:
dh_auto_clean
rm -rf .testrepository
find . -iname '*.pyc' -delete
rm -f debian/*.init debian/*.service debian/*.upstart
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
rm -rf .testrepository
testr init
set -e ; \
TEMP_REZ=`mktemp -t` ; \
bash -x ./debian/setup-test-env-mongodb.sh testr run --subunit --parallel 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*|.*meter\.test_notifications\.TestMeterProcessing\.test_fallback_meter_path.*|.*agent\.test_manager\.TestRunTasks\.test_batching_polled_samples_false.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
rm -f $$TEMP_REZ ;
testr slowest
endif
override_dh_sphinxdoc:
ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment