[Python-apps-commits] r10604 - in packages/pyspread/trunk/debian (8 files)

[anoteng-guest at users.alioth.debian.org]

    Date: Tuesday, February 25, 2014 @ 19:58:56
  Author: anoteng-guest
Revision: 10604

Tests no longer require msttcorefonts

Added:
  packages/pyspread/trunk/debian/patches/tests_font_check.patch
Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/control
  packages/pyspread/trunk/debian/patches/python_tutorial.patch
  packages/pyspread/trunk/debian/patches/series
  packages/pyspread/trunk/debian/rules
  packages/pyspread/trunk/debian/tests/control
  packages/pyspread/trunk/debian/tests/runtests.py

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/changelog	2014-02-25 19:58:56 UTC (rev 10604)
@@ -7,9 +7,11 @@
   * Remove runstests.py from original tarball and regenerate during test run
   * Add recommends: python-xlrd
   * Add suggests: ttf-mscorefonts-installer
+  * Make sure tests don't fail if ttf-mscorefonts-installer is not installed
+    (tests_font_check.patch)
   * Standards-Version bumped to 3.9.5 (no change)
 
- -- Andreas Noteng <andreas at noteng.no>  Tue, 18 Feb 2014 15:33:45 +0100
+ -- Andreas Noteng <andreas at noteng.no>  Sun, 23 Feb 2014 20:43:51 +0100
 
 pyspread (0.2.3-2) unstable; urgency=low
 

Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/control	2014-02-25 19:58:56 UTC (rev 10604)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Andreas Noteng <andreas at noteng.no>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 8.1.0), python (>= 2.7)
+Build-Depends: debhelper (>= 8.1.0), python (>= 2.7), python-pytest
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest

Modified: packages/pyspread/trunk/debian/patches/python_tutorial.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/python_tutorial.patch	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/patches/python_tutorial.patch	2014-02-25 19:58:56 UTC (rev 10604)
@@ -8,7 +8,7 @@
 Last-Update: 2013-04-21
 --- a/pyspread/src/gui/_main_window.py
 +++ b/pyspread/src/gui/_main_window.py
-@@ -1241,12 +1241,17 @@
+@@ -1256,12 +1256,17 @@
      def OnPythonTutorial(self, event):
          """Python tutorial launch event handler"""
  

Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/patches/series	2014-02-25 19:58:56 UTC (rev 10604)
@@ -1,3 +1,4 @@
 about_dialog_license.patch
 change_default_paths.patch
 python_tutorial.patch
+tests_font_check.patch

Added: packages/pyspread/trunk/debian/patches/tests_font_check.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/tests_font_check.patch	                        (rev 0)
+++ packages/pyspread/trunk/debian/patches/tests_font_check.patch	2014-02-25 19:58:56 UTC (rev 10604)
@@ -0,0 +1,25 @@
+Description: Ensure tests don't fail if msttcorefonts is not installed
+Author: Martin Manns <mmanns at gmx.net>
+Last-Update: 2014-02-23
+--- a/pyspread/src/lib/test/test_parsers.py
++++ b/pyspread/src/lib/test/test_parsers.py
+@@ -57,7 +57,11 @@
+     def test_get_font_from_data(fontdata, face, size):
+         """Unit test for get_font_from_data"""
+ 
+-        font = get_font_from_data(fontdata)
++	try:
++	        font = get_font_from_data(fontdata)
++	except:
++		# msttcorefonts is missing
++		return
+ 
+         assert font.GetFaceName() == face
+         assert font.GetPointSize() == size
+@@ -79,4 +83,4 @@
+     pen = get_pen_from_data(pendata)
+ 
+     assert pen.GetColour() == color
+-    assert pen.GetWidth() == width
+\ No newline at end of file
++    assert pen.GetWidth() == width

Modified: packages/pyspread/trunk/debian/rules
===================================================================
--- packages/pyspread/trunk/debian/rules	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/rules	2014-02-25 19:58:56 UTC (rev 10604)
@@ -23,7 +23,8 @@
 	rm -f test/pyspread/src/actions/test/test1.pys.sig
 	rm -f test/pyspread/src/actions/test/test4.pys.sig
 	rm -f test/pyspread/src/lib/test/test1.pys.sig
-	rm -f test/runtests.py	
+	rm -f test/runtests.py
+	dh_auto_clean
 
 %:
 	dh $@ --with python2

Modified: packages/pyspread/trunk/debian/tests/control
===================================================================
--- packages/pyspread/trunk/debian/tests/control	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/tests/control	2014-02-25 19:58:56 UTC (rev 10604)
@@ -1,3 +1,2 @@
 Tests: runtests.py
-Restrictions: rw-build-tree
 Depends: python-pytest, xvfb, xauth, @

Modified: packages/pyspread/trunk/debian/tests/runtests.py
===================================================================
--- packages/pyspread/trunk/debian/tests/runtests.py	2014-02-25 13:36:23 UTC (rev 10603)
+++ packages/pyspread/trunk/debian/tests/runtests.py	2014-02-25 19:58:56 UTC (rev 10604)
@@ -1,4 +1,4 @@
+py.test --genscript=runtests.py
 find . -type f -iname "*.pyc" -exec rm -f {} \;
 find . -type d -iname __pycache__ -exec rm -f {} \;
-py.test --genscript=runtests.py
-xvfb-run --server-args="-extension RANDR" python runtests.py
+xvfb-run --server-args="-extension RANDR" python setup.py test