diff --git a/debian/changelog b/debian/changelog index 72d3e3f6..64623c1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ python-taskflow (2.2.0-1) experimental; urgency=medium [ Thomas Goirand ] * New upstream release. * Fixed (build-)depends for this release. + * Using pkgos-dh_auto_{test,install} from openstack-pkg-tools >= 52~. -- Thomas Goirand Wed, 13 Jul 2016 21:47:19 +0200 diff --git a/debian/control b/debian/control index 51593f0f..48831269 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: PKG OpenStack Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), dh-python, - openstack-pkg-tools, + openstack-pkg-tools (>= 52~), python-all, python-pbr (>= 1.8), python-setuptools, diff --git a/debian/rules b/debian/rules index 78aff606..6ce8148c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,26 +1,13 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - UPSTREAM_GIT := https://github.com/openstack/taskflow.git include /usr/share/openstack-pkg-tools/pkgos.make -export OSLO_PACKAGE_VERSION=$(VERSION) - %: 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-taskflow; \ - done - set -e ; for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-taskflow; \ - done - rm -f $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth +override_dh_auto_install: + pkgos-dh_auto_install override_dh_clean: dh_clean -O--buildsystem=python_distutils @@ -28,18 +15,7 @@ override_dh_clean: override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - @echo "===> Running tests" - set -e ; set -x ; for i in 2.7 $(PYTHON3S) ; 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 'taskflow\.tests\.(?!.*test_examples\.ExamplesTestCase\.test_99_bottles.*)' | tee $$TEMP_REZ | subunit2pyunit ; \ - cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \ - rm -f $$TEMP_REZ ; \ - testr-python$$PYMAJOR slowest ; \ - done + pkgos-dh_auto_test 'taskflow\.tests\.(?!.*test_examples\.ExamplesTestCase\.test_99_bottles.*)' endif override_dh_sphinxdoc: