[Python-modules-commits] r15138 - in packages/cheetah/trunk/debian (5 files)

Sun Dec 26 09:43:25 UTC 2010

Date: Sunday, December 26, 2010 @ 09:43:23
  Author: arnau
Revision: 15138

* New upstream release.
  + Cheetah now officially supports python 2.7. Closes: #605422.
    - Require python-support >= 1.0.12 as Build-Depends.
    - Require python-all-dev >= 2.6.6-9 as Build-Depends.
    - Require python-setuptools >= 0.6.14-5 as Build-Depends.
* debian/control:
  + Bump Standards-Version to 3.9.1. No changes needed.
* Add debian/patches/fix_compile_with_utf8_attribute.patch:
  + UnicodeEncodeError exception raised when an attribute is an UTF-8
    string. Thanks to Carles Mu?\195?\177oz Gorriz. Closes: #584966.
* debian/rules:
  + Run test suites for all Python versions during the build.
    Closes: #606517.

Added:
  packages/cheetah/trunk/debian/patches/fix_compile_with_utf8_attribute.patch
Modified:
  packages/cheetah/trunk/debian/changelog
  packages/cheetah/trunk/debian/control
  packages/cheetah/trunk/debian/patches/series
  packages/cheetah/trunk/debian/rules

Modified: packages/cheetah/trunk/debian/changelog
===================================================================

--- packages/cheetah/trunk/debian/changelog	2010-12-24 16:02:06 UTC (rev 15137)
+++ packages/cheetah/trunk/debian/changelog	2010-12-26 09:43:23 UTC (rev 15138)
@@ -1,3 +1,21 @@
+cheetah (2.4.4-1) experimental; urgency=low
+
+  * New upstream release.
+    + Cheetah now officially supports python 2.7. Closes: #605422.
+      - Require python-support >= 1.0.12 as Build-Depends.
+      - Require python-all-dev >= 2.6.6-9 as Build-Depends.
+      - Require python-setuptools >= 0.6.14-5 as Build-Depends.
+  * debian/control:
+    + Bump Standards-Version to 3.9.1. No changes needed.
+  * Add debian/patches/fix_compile_with_utf8_attribute.patch:
+    + UnicodeEncodeError exception raised when an attribute is an UTF-8
+      string. Thanks to Carles MuÃ±oz Gorriz. Closes: #584966.
+  * debian/rules:
+    + Run test suites for all Python versions during the build.
+      Closes: #606517.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Sat, 25 Dec 2010 14:14:19 +0900
+
 cheetah (2.4.2.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/cheetah/trunk/debian/control
===================================================================
--- packages/cheetah/trunk/debian/control	2010-12-24 16:02:06 UTC (rev 15137)
+++ packages/cheetah/trunk/debian/control	2010-12-26 09:43:23 UTC (rev 15138)
@@ -5,11 +5,11 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.37.2),
 	       cdbs (>= 0.4.43),
-	       python-all-dev (>= 2.3.5-11),
-	       python-support (>= 0.90),
-	       python-setuptools (>= 0.6b3),
+	       python-all-dev (>= 2.6.6-9),
+	       python-support (>= 1.0.12),
+	       python-setuptools (>= 0.6.14-5),
 	       python-markdown (>= 2.0.1)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.cheetahtemplate.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/cheetah/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/cheetah/trunk/

Added: packages/cheetah/trunk/debian/patches/fix_compile_with_utf8_attribute.patch
===================================================================
--- packages/cheetah/trunk/debian/patches/fix_compile_with_utf8_attribute.patch	                        (rev 0)
+++ packages/cheetah/trunk/debian/patches/fix_compile_with_utf8_attribute.patch	2010-12-26 09:43:23 UTC (rev 15138)
@@ -0,0 +1,17 @@
+--- a/cheetah/Compiler.py	2010-02-08 05:17:23.000000000 +0100
++++ b/cheetah/Compiler.py	2010-06-08 06:50:28.000000000 +0200
+@@ -1474,8 +1474,12 @@
+         return '\n\n'.join(methodDefs)
+ 
+     def attributes(self):
+-        attribs = [self.setting('indentationStep') + str(attrib)
+-                      for attrib in self._generatedAttribs ]
++        try:
++            attribs = [self.setting('indentationStep') + str(attrib)
++                          for attrib in self._generatedAttribs ]
++        except UnicodeEncodeError:
++            attribs = [self.setting('indentationStep') + unicode(attrib)
++                          for attrib in self._generatedAttribs ]
+         return '\n\n'.join(attribs)
+   
+ class AutoClassCompiler(ClassCompiler):

Modified: packages/cheetah/trunk/debian/patches/series
===================================================================
--- packages/cheetah/trunk/debian/patches/series	2010-12-24 16:02:06 UTC (rev 15137)
+++ packages/cheetah/trunk/debian/patches/series	2010-12-26 09:43:23 UTC (rev 15138)
@@ -1 +1,2 @@
 fix_ftbfs_c_extension_python25.patch
+fix_compile_with_utf8_attribute.patch

Modified: packages/cheetah/trunk/debian/rules
===================================================================
--- packages/cheetah/trunk/debian/rules	2010-12-24 16:02:06 UTC (rev 15137)
+++ packages/cheetah/trunk/debian/rules	2010-12-26 09:43:23 UTC (rev 15138)
@@ -9,13 +9,28 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-# Prepare support  for python 3.x  (need to add  Build-Depends against
-# python3-all-dev in debian/control).
-# cdbs_python_supported_versions += $(shell dpkg-query -W -f='$${Depends}' python3-all-dev | sed 's/.*python\(3\.[0-9]\)-dev.*/\1/')
+# Prepare support for python 3.x (need to add Build-Depends against
+# python3-all-dev in debian/control), pending upstream release with
+# python3 support
+# cdbs_python_supported_versions += $(shell py3versions -vr)
 
 # Install egg-info directories
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+DEB_PYTHON_BUILDDIR := $(CURDIR)/$(DEB_BUILDDIR)/build
 
-install/$(DEB_PYTHON_MODULE_PACKAGES)::
+binary-post-install/python-cheetah::
 	sed -i 's#\#!/usr/bin/python[0-9].[0-9]#\#!/usr/bin/python#' \
 		$(cdbs_python_destdir)usr/bin/*
+
+	# Run the tests with all the versions of Python, but do not
+	# fail if the tests fail, just display an error message
+	#
+	# Any better way to run the tests as this is very ugly?
+	for buildver in $(cdbs_python_build_versions); do \
+		echo "Running tests with python$$buildver" && \
+		cd $(DEB_SRCDIR) && \
+		PATH=$(DEB_PYTHON_BUILDDIR)/scripts-$${buildver}:$$PATH \
+		PYTHONPATH=$$(echo $(DEB_PYTHON_BUILDDIR)/lib.linux-*-$$buildver) \
+		$(call cdbs_python_binary,python$$buildver) $(DEB_SRCDIR)/cheetah/Tests/Test.py || \
+		echo "Running tests FAILED with python$$buildver"; \
+	done


