[Python-modules-commits] r34243 - in packages/wtforms/trunk/debian (11 files)

bernat at users.alioth.debian.org bernat at users.alioth.debian.org
Mon Sep 14 15:55:21 UTC 2015


    Date: Monday, September 14, 2015 @ 15:55:20
  Author: bernat
Revision: 34243

Update to 2.0.2

This is a sponsored upload for Orestis Ioannou <orestis at oioannou.com>.

Packaging has been simplified by migrating to new dh style helper. Due
to the addition of the new Python 3 package, the documentation is now
shipped in a different package. Moreover, dh_sphinxdoc is used to
handle JS stuff.

The custom layout was puzzling dh_sphinxdoc and was therefore just
wiped out (it is not used on readthedocs.org either). This was simpler
and more future-proof than patching out the layout.

Added:
  packages/wtforms/trunk/debian/patches/
  packages/wtforms/trunk/debian/patches/fix-apps-not-ready.patch
  packages/wtforms/trunk/debian/patches/series
  packages/wtforms/trunk/debian/python-wtforms-doc.docs
Modified:
  packages/wtforms/trunk/debian/changelog
  packages/wtforms/trunk/debian/control
  packages/wtforms/trunk/debian/copyright
  packages/wtforms/trunk/debian/rules
  packages/wtforms/trunk/debian/source/format
Deleted:
  packages/wtforms/trunk/debian/docs
  packages/wtforms/trunk/debian/links

Modified: packages/wtforms/trunk/debian/changelog
===================================================================
--- packages/wtforms/trunk/debian/changelog	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/changelog	2015-09-14 15:55:20 UTC (rev 34243)
@@ -1,3 +1,17 @@
+wtforms (2.0.2-1) UNRELEASED; urgency=medium
+  
+  * Team upload.
+  * New upstream release
+  * Add python 3 package
+  * copyright file updated to DEP-5
+  * Switched to pybuild
+  * Moved to Standards-Version: 3.9.6
+  * Switched to 3.0 quilt patch format
+  * Added a patch to fix failing tests due to Django not being setup
+  * Created separate documentation package
+
+ -- Orestis Ioannou <orestis at oioannou.com>  Mon, 14 Sep 2015 17:51:19 +0200
+
 wtforms (2.0.1-1) unstable; urgency=medium
 
   * New upstream version

Modified: packages/wtforms/trunk/debian/control
===================================================================
--- packages/wtforms/trunk/debian/control	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/control	2015-09-14 15:55:20 UTC (rev 34243)
@@ -3,11 +3,27 @@
 Uploaders: Bernd Zeimetz <bzed at debian.org>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-setuptools
-Build-Depends-Indep: python-sqlalchemy (>= 0.5), python-django, python-dateutil,
- python-sphinx (>= 0.6), python (>= 2.6.6-3~) | python-pysqlite2
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.4
+Build-Depends: debhelper (>=9),
+               python-all,
+               dh-python,
+               python-setuptools,
+               python3-all,
+               python3-setuptools,
+               python-sqlalchemy (>= 0.5),
+               python-django,
+               python-dateutil,
+               python-sphinx (>= 0.6), 
+               python3-sqlalchemy,
+               python3-django,
+               python3-dateutil,
+               python3-sphinx,
+               python-babel,
+               python3-babel,
+               python-coverage,
+               python3-coverage
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.6
+X-Python3-Version: >=3.3
 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/
@@ -15,10 +31,30 @@
 Package: python-wtforms
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Suggests: python-sqlalchemy  (>= 0.5), python-django
-Recommends: python-dateutil, libjs-jquery, libjs-underscore
-Description: flexible forms validation and rendering library for Python
+Suggests: python-sqlalchemy (>=0.5), python-django
+Description: flexible forms validation and rendering library for Python 2
  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
+ one 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, python3-django
+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
+ one to create forms based on ORM models from Django, SqlAlchemy and the
+ Google
+
+Package: python-wtforms-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: flexible forms validation and rendering library for Python (doc)
+ Documentation for WTForms. WTForms is a HTML form field generator which
+ allows full customization with templates, using the template engine of your
+ choice. It also allows one to create forms based on ORM models from Django,
+ SqlAlchemy and the Google

Modified: packages/wtforms/trunk/debian/copyright
===================================================================
--- packages/wtforms/trunk/debian/copyright	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/copyright	2015-09-14 15:55:20 UTC (rev 34243)
@@ -1,59 +1,36 @@
-This package was debianized by Bernd Zeimetz <bzed at debian.org> on
-Sun Oct 17 16:41:08 CEST 2010
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/  
+Upstream-Name: WTForms     
+Source: http://pypi.python.org/pypi/WTForms
+   
+Files: *   
+Copyright: 2014 by Thomas Johansson, James Crasta and others.      
+License: BSD-3
+  
+Files: debian/*
+Copyright: 2010 Bernd Zeimetz <bzed at debian.org> 
+License: BSD-3
 
-It was downloaded from http://pypi.python.org/pypi/WTForms
-
-Upstream Authors:
-
-    WTForms is written and maintained by the WTForms Team and various contributors.
-    
-    Lead Developers:
-    
-    - Thomas Johansson <prencher at gmail.com>
-    - James Crasta <james at crasta.com>
-    
-    Contributors:
-    
-    - Ali Aafshar
-    - Adam Lowry
-    - Christopher Grebs
-    - Emil Vladev
-    - Rodrigo Moraes
-    - Sebastian Wiesner
-    - Vinay Sajip
-    
-
-License and Copyright information:    
-    
-    Copyright (c) 2010 by Thomas Johansson, James Crasta and others.
-    All rights reserved.
-    
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-    
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-    
-        * Redistributions in binary form must reproduce the above copyright notice,
-          this list of conditions and the following disclaimer in the documentation
-          and/or other materials provided with the distribution.
-    
-        * The names of the contributors may not be used to endorse or promote
-          products derived from this software without specific prior written
-          permission.
-    
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The Debian packaging is Copyright (C) 2010 Bernd Zeimetz <bzed at debian.org> and
-licensed under the same license as WTForms, see above.
-
+License: BSD-3
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+    * The names of the contributors may not be used to endorse or
+    promote products derived from this software without specific
+    prior written permission.
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: packages/wtforms/trunk/debian/docs
===================================================================
--- packages/wtforms/trunk/debian/docs	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/docs	2015-09-14 15:55:20 UTC (rev 34243)
@@ -1 +0,0 @@
-docs/_build/html

Deleted: packages/wtforms/trunk/debian/links
===================================================================
--- packages/wtforms/trunk/debian/links	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/links	2015-09-14 15:55:20 UTC (rev 34243)
@@ -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

Added: packages/wtforms/trunk/debian/patches/fix-apps-not-ready.patch
===================================================================
--- packages/wtforms/trunk/debian/patches/fix-apps-not-ready.patch	                        (rev 0)
+++ packages/wtforms/trunk/debian/patches/fix-apps-not-ready.patch	2015-09-14 15:55:20 UTC (rev 34243)
@@ -0,0 +1,12 @@
+Setup django to fix django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet.
+--- a/tests/ext_django/tests.py
++++ b/tests/ext_django/tests.py
+@@ -33,6 +33,8 @@
+         }
+     }
+ )
++import django
++django.setup()
+ 
+ from django.db import connection
+ connection.creation.create_test_db(verbosity=0)

Added: packages/wtforms/trunk/debian/patches/series
===================================================================
--- packages/wtforms/trunk/debian/patches/series	                        (rev 0)
+++ packages/wtforms/trunk/debian/patches/series	2015-09-14 15:55:20 UTC (rev 34243)
@@ -0,0 +1 @@
+fix-apps-not-ready.patch

Added: packages/wtforms/trunk/debian/python-wtforms-doc.docs
===================================================================
--- packages/wtforms/trunk/debian/python-wtforms-doc.docs	                        (rev 0)
+++ packages/wtforms/trunk/debian/python-wtforms-doc.docs	2015-09-14 15:55:20 UTC (rev 34243)
@@ -0,0 +1 @@
+docs/_build/html

Modified: packages/wtforms/trunk/debian/rules
===================================================================
--- packages/wtforms/trunk/debian/rules	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/rules	2015-09-14 15:55:20 UTC (rev 34243)
@@ -1,26 +1,14 @@
 #!/usr/bin/make -f
 
+export PYBUILD_NAME=wtforms
 %:
-	dh --buildsystem=python_distutils --with=python2 $@
+	dh $@ --with sphinxdoc,python2,python3 --buildsystem=pybuild $@
 
-build:
-	dh --buildsystem=python_distutils --with=python2 $@
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	-cd tests ;\
-	    for python in $(shell pyversions -vr); do \
-	        export PYTHONPATH=`echo ../build/lib*-$${python}` ;\
-		python$${python} runtests.py ext_sqlalchemy ext_dateutil ext_django ;\
-	done
-endif
-
+override_dh_auto_build:
+	dh_auto_build
+	rm docs/_templates/layout.html
 	cd docs && make html
-	rm docs/_build/html/_static/jquery.js
-	rm docs/_build/html/_static/underscore.js
 
-clean:
-	dh --buildsystem=python_distutils --with=python2 $@
-	rm -rf docs/_build
-
-
-override_dh_compress:
-	dh_compress -X/html/
+override_dh_auto_install:
+	dh_auto_install
+	chmod 644 debian/*/usr/lib/python*/dist-packages/wtforms/locale/*/LC_MESSAGES/wtforms.mo

Modified: packages/wtforms/trunk/debian/source/format
===================================================================
--- packages/wtforms/trunk/debian/source/format	2015-09-14 12:48:16 UTC (rev 34242)
+++ packages/wtforms/trunk/debian/source/format	2015-09-14 15:55:20 UTC (rev 34243)
@@ -1 +1 @@
-1.0
+3.0 (quilt)




More information about the Python-modules-commits mailing list