From 45fa107f8d5b86d20608cb3edb45f8b3eb4aef73 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 17 Feb 2015 14:57:05 +0000 Subject: [PATCH] python-sphinx as build-depends, running nosetests --- debian/control | 17 +++++++++++++---- debian/copyright | 1 - debian/rules | 11 +++++++---- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index 5ffd44f..5a5e518 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,17 @@ Section: python Priority: optional Maintainer: PKG OpenStack Uploaders: Thomas Goirand -Build-Depends: debhelper (>= 9), dh-python, python-setuptools, python-all (>= 2.6.6-3~), python3-setuptools, python3-all +Build-Depends: debhelper (>= 9), + dh-python, + python-all (>= 2.6.6-3~), + python-setuptools, + python-sphinx, + python3-all, + python3-setuptools +Build-Depends-Indep: python-nose, + python-nose-timer, + python3-nose, + python3-nose-timer Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-kafka.git Vcs-Git: git://anonscm.debian.org/openstack/python-kafka.git @@ -12,7 +22,7 @@ Homepage: https://github.com/mumrah/kafka-python Package: python-kafka Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${python:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${python:Depends} Suggests: python-kafka-doc Description: Pure Python client for Apache Kafka - Python 2.x This module provides low-level protocol support for Apache Kafka as well as @@ -25,7 +35,7 @@ Description: Pure Python client for Apache Kafka - Python 2.x Package: python3-kafka Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${python3:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${python3:Depends} Suggests: python-kafka-doc Description: Pure Python client for Apache Kafka - Python 3.x This module provides low-level protocol support for Apache Kafka as well as @@ -47,4 +57,3 @@ Description: Pure Python client for Apache Kafka - doc is also supported for message sets. . This package contains the documentation. - diff --git a/debian/copyright b/debian/copyright index 1f2fe2b..fbf2cdc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,4 +25,3 @@ License: Apache-2 . 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. - diff --git a/debian/rules b/debian/rules index 481db2d..44bc434 100755 --- a/debian/rules +++ b/debian/rules @@ -22,14 +22,17 @@ override_dh_install: override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \ - python$$pyvers setup.py test ; \ - done + ln -s kafka kafka-python + PYTHON=python2.7 PYTHONPATH=. nosetests --with-timer --timer-top-n 10 --with-coverage --cover-erase --cover-package kafka + PYTHON=python3 PYTHONPATH=. nosetests3 +# set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \ +# PYTHON=python$$pyvers setup.py test ; \ +# done endif override_dh_clean: dh_clean -O--buildsystem=python_distutils - rm -rf build + rm -rf build kafka-python override_dh_sphinxdoc: sphinx-build -b html docs debian/python-kafka-doc/usr/share/doc/python-kafka-doc/html