From 40a85757d491f411a8539d3537bb5a81c9f5abdf Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 14 Sep 2014 18:27:07 +0800 Subject: [PATCH] Added Python 3 support (Closes: #761294). --- debian/changelog | 6 ++++++ debian/control | 21 ++++++++++++++++----- debian/python-bootstrapform.install | 1 - debian/rules | 19 +++++++++++++------ 4 files changed, 35 insertions(+), 12 deletions(-) delete mode 100644 debian/python-bootstrapform.install diff --git a/debian/changelog b/debian/changelog index 5447341..88435ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-django-bootstrap-form (3.1.0-5) unstable; urgency=medium + + * Added Python 3 support (Closes: #761294). + + -- Thomas Goirand Sun, 14 Sep 2014 18:20:33 +0800 + python-django-bootstrap-form (3.1.0-4) unstable; urgency=medium * Added patches for Django 1.7 (Closes: #755656). Thanks to Raphael Hertzog diff --git a/debian/control b/debian/control index 993f4a7..9062e96 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,15 @@ Source: python-django-bootstrap-form Section: python Priority: optional Maintainer: PKG OpenStack -Uploaders: Julien Danjou , - Thomas Goirand , - Mehdi Abaakouk +Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python-setuptools, python-sphinx (>= 1.0.7+dfsg), - python-django + python-django, + python3-django, + python3-all (>= 3.2), + python3-setuptools Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-django-bootstrap-form.git Vcs-Git: git://anonscm.debian.org/openstack/python-django-bootstrap-form.git @@ -19,12 +20,22 @@ Package: python-bootstrapform Architecture: all Pre-Depends: dpkg (>= 1.15.6~) Depends: ${misc:Depends}, ${python:Depends} -Description: generate twitter-bootstrap form output for django form +Description: generate twitter-bootstrap form output for django form - Python 2.x Django bootstrap form generates twitter-bootstrap form output for django form. A simple Django template tag to work with twitter bootstrap. . This package contains the Python 2.x module. +Package: python3-bootstrapform +Architecture: all +Pre-Depends: dpkg (>= 1.15.6~) +Depends: ${misc:Depends}, ${python3:Depends} +Description: generate twitter-bootstrap form output for django form - Python 3.x + Django bootstrap form generates twitter-bootstrap form output for django form. + A simple Django template tag to work with twitter bootstrap. + . + This package contains the Python 3.x module. + Package: python-bootstrapform-doc Section: doc Architecture: all diff --git a/debian/python-bootstrapform.install b/debian/python-bootstrapform.install deleted file mode 100644 index 47e0ed4..0000000 --- a/debian/python-bootstrapform.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/python* diff --git a/debian/rules b/debian/rules index 08363a1..4134b92 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,32 @@ #!/usr/bin/make -f PYTHONS:=$(shell pyversions -vr) -#PYTHON3S:=$(shell py3versions -vr) +PYTHON3S:=$(shell py3versions -vr) UPSTREAM_GIT = git://github.com/tzangms/django-bootstrap-form.git -include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python2,sphinxdoc + dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc override_dh_sphinxdoc: PYTHONPATH=$(CURDIR) sphinx-build docs debian/python-bootstrapform-doc/usr/share/doc/python-bootstrapform-doc dh_sphinxdoc -O--buildsystem=python_distutils -override_dh_install: - rm -r $(CURDIR)/debian/tmp/usr/lib/python*/dist-packages/tests/ - dh_install -O--buildsystem=python_distutils +override_dh_auto_install: + set -e && for pyvers in $(PYTHONS); do \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python-bootstrapform; \ + done + set -e && for pyvers in $(PYTHON3S); do \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python3-bootstrapform; \ + done + rm -r $(CURDIR)/debian/python*-bootstrapform/usr/lib/python*/dist-packages/tests/ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - set -e && for pyvers in $(PYTHONS); do \ + set -e && for pyvers in $(PYTHONS) $(PYTHON3S) ; do \ python$$pyvers setup.py test ; \ done endif