hello bernd, hello python modules team,

On Wed, Feb 12, 2014 at 07:41:12PM +0100, chrysn wrote:
> * python3 is now supported

as i prefer to use python3 these days, i've added a python3-wtforms
package in the patches attached. things didn't work out of the box with
--buildsystem=python_distutils with my limited understanding thereof,
but --buildsystem=pybuild just did the trick, so that's a major change
in 0001-pybuild-working-with-python3.patch. (also, bumped debhelper
compat to 9 -- at least 8 would have been required for pybuild).

until bug #736878 is fixed, python3-django is not mentioned. the
'Disabled test' issue persists.

the documentation i split out into a -doc package in a second patch
(0002-split-documentation-out-into-dedicated-package.patch). i tried
adding ,sphinxdoc to --with, but dh_sphinxdoc did not recognize the
generated documentation. i did not investigate much further, as i don't
know how sphinx documentation is usually built.

please consider including python3 support when uploading an updated
version.

best regards
chrysn

-- 
To use raw power is to make yourself infinitely vulnerable to greater powers.
  -- Bene Gesserit axiom
From dd460b124d7a3951f00138557e08b944b51641e2 Mon Sep 17 00:00:00 2001
From: chrysn <[email protected]>
Date: Fri, 14 Feb 2014 12:14:32 +0100
Subject: [PATCH 1/2] pybuild working with python3

---
 debian/compat                  |  2 +-
 debian/control                 | 20 ++++++++++++++++++--
 debian/python-wtforms.install  |  1 +
 debian/python3-wtforms.install |  1 +
 debian/rules                   |  6 +++---
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 debian/python-wtforms.install
 create mode 100644 debian/python3-wtforms.install

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index c2becea..7532dd5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,14 @@ Maintainer: Debian Python Modules Team <[email protected].
 Uploaders: Bernd Zeimetz <[email protected]>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~), python3-all, dh-python, python-setuptools
 Build-Depends-Indep: python-sqlalchemy (>= 0.5), python-django, python-dateutil,
- python-sphinx (>= 0.6), python (>= 2.6.6-3~) | python-pysqlite2
+ python-sphinx (>= 0.6), python (>= 2.6.6-3~) | python-pysqlite2,
+ python3-sqlalchemy (>= 0.5), python3-dateutil,
+ python3-sphinx (>= 0.6)
 Standards-Version: 3.9.1
 X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
 Homepage: http://wtforms.simplecodes.com/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/wtforms/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/wtforms/trunk/
@@ -22,3 +25,16 @@ Description: flexible forms validation and rendering library for Python
  with templates, using the template engine of your choice. It also allows
  to create forms based on ORM models from Django, SqlAlchemy and the
  Google Appengine.
+
+Package: python3-wtforms
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Suggests: python3-sqlalchemy  (>= 0.5)
+Recommends: python3-dateutil, libjs-jquery, libjs-underscore
+Description: flexible forms validation and rendering library for Python 3
+ WTForms is a HTML form field generator which allows full customization
+ with templates, using the template engine of your choice. It also allows
+ to create forms based on ORM models from Django, SqlAlchemy and the
+ Google Appengine.
+ .
+ This is the Python 3 version of the package.
diff --git a/debian/python-wtforms.install b/debian/python-wtforms.install
new file mode 100644
index 0000000..b2cc136
--- /dev/null
+++ b/debian/python-wtforms.install
@@ -0,0 +1 @@
+usr/lib/python2*
diff --git a/debian/python3-wtforms.install b/debian/python3-wtforms.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-wtforms.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index 6c564d0..42a1fc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 %:
-	dh --buildsystem=python_distutils --with=python2 $@
+	dh $@ --buildsystem=pybuild --with=python2,python3
 
 build:
-	dh --buildsystem=python_distutils --with=python2 $@
+	dh $@ --buildsystem=pybuild --with=python2,python3
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	-cd tests ;\
 	    for python in $(shell pyversions -vr); do \
@@ -17,7 +17,7 @@ endif
 	rm docs/_build/html/_static/jquery.js
 
 clean:
-	dh --buildsystem=python_distutils --with=python2 $@
+	dh $@ --buildsystem=pybuild --with=python2,python3
 	rm -rf docs/_build
 
 
-- 
1.9.0.rc3

From 1c6b1df641920eb55f01ac96e699beffd6c513e4 Mon Sep 17 00:00:00 2001
From: chrysn <[email protected]>
Date: Fri, 14 Feb 2014 12:40:52 +0100
Subject: [PATCH 2/2] split documentation out into dedicated package

---
 debian/control                  | 19 ++++++++++++++++---
 debian/docs                     |  1 -
 debian/links                    |  2 --
 debian/python-wtforms-doc.docs  |  1 +
 debian/python-wtforms-doc.links |  2 ++
 5 files changed, 19 insertions(+), 6 deletions(-)
 delete mode 100644 debian/docs
 delete mode 100644 debian/links
 create mode 100644 debian/python-wtforms-doc.docs
 create mode 100644 debian/python-wtforms-doc.links

diff --git a/debian/control b/debian/control
index 7532dd5..cb18b57 100644
--- a/debian/control
+++ b/debian/control
@@ -18,18 +18,31 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/wtforms/tr
 Package: python-wtforms
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Suggests: python-sqlalchemy  (>= 0.5), python-django
-Recommends: python-dateutil, libjs-jquery, libjs-underscore
+Suggests: python-sqlalchemy  (>= 0.5), python-django, python-wtforms-doc
+Recommends: python-dateutil
 Description: flexible forms validation and rendering library for Python
  WTForms is a HTML form field generator which allows full customization
  with templates, using the template engine of your choice. It also allows
  to create forms based on ORM models from Django, SqlAlchemy and the
  Google Appengine.
 
+Package: python-wtforms-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libjs-jquery, libjs-underscore
+Description: flexible forms validation and rendering library for Python (documentation)
+ WTForms is a HTML form field generator which allows full customization
+ with templates, using the template engine of your choice. It also allows
+ to create forms based on ORM models from Django, SqlAlchemy and the
+ Google Appengine.
+ .
+ This package contains the documentation for wtforms.
+
 Package: python3-wtforms
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
-Suggests: python3-sqlalchemy  (>= 0.5)
+Suggests: python3-sqlalchemy  (>= 0.5), python-wtforms-doc
 Recommends: python3-dateutil, libjs-jquery, libjs-underscore
 Description: flexible forms validation and rendering library for Python 3
  WTForms is a HTML form field generator which allows full customization
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 4ecc793..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/_build/html
diff --git a/debian/links b/debian/links
deleted file mode 100644
index fb57797..0000000
--- a/debian/links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/javascript/jquery/jquery.js usr/share/doc/python-wtforms/html/_static/jquery.js
-/usr/share/javascript/underscore/underscore.js usr/share/doc/python-wtforms/html/_static/underscore.js
diff --git a/debian/python-wtforms-doc.docs b/debian/python-wtforms-doc.docs
new file mode 100644
index 0000000..4ecc793
--- /dev/null
+++ b/debian/python-wtforms-doc.docs
@@ -0,0 +1 @@
+docs/_build/html
diff --git a/debian/python-wtforms-doc.links b/debian/python-wtforms-doc.links
new file mode 100644
index 0000000..34e9ffd
--- /dev/null
+++ b/debian/python-wtforms-doc.links
@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js usr/share/doc/python-wtforms-doc/html/_static/jquery.js
+/usr/share/javascript/underscore/underscore.js usr/share/doc/python-wtforms-doc/html/_static/underscore.js
-- 
1.9.0.rc3

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Python-modules-team mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to