[Python-modules-commits] r20419 - in packages/sphinx/trunk/debian (5 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, February 12, 2012 @ 18:53:17
  Author: jwilk
Revision: 20419

Run tests against Python 3.

Added:
  packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control
  packages/sphinx/trunk/debian/patches/series
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-02-12 18:32:06 UTC (rev 20418)
+++ packages/sphinx/trunk/debian/changelog	2012-02-12 18:53:17 UTC (rev 20419)
@@ -8,8 +8,15 @@
     privileges are not needed (e.g. because binary target was run under
     fakeroot), and even if they are actually needed, the target will fail
     quickly.
+  * Run tests against Python 3:
+    + Add build-dependency on python3-nose, python3-docutils,
+      python3-pygments, python3-jinja2, python3-sqlalchemy.
+    + Add python3_test_build_dir.diff to hardcode Python 3 build directory in
+      the test runner to the one that the package uses.
+    + Add test running code debian/rules. Don't use --no-skip for the moment,
+      as some required packages don't exist yet (see #647441, #647439).
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 12 Feb 2012 18:34:51 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 12 Feb 2012 19:52:58 +0100
 
 sphinx (1.1.2+dfsg-4) unstable; urgency=low
 

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2012-02-12 18:32:06 UTC (rev 20418)
+++ packages/sphinx/trunk/debian/control	2012-02-12 18:53:17 UTC (rev 20419)
@@ -8,13 +8,14 @@
 Build-Depends-Indep: python-support (>= 0.6.4),
   python-all (>= 2.5.4-1~), python3 (>= 3.1.2-7~),
   python-setuptools (>= 0.6c5-1~), python3-setuptools,
-  python-docutils (>= 0.7),
-  python-pygments (>= 1.2),
-  python-jinja2 (>= 2.3),
-  python-sqlalchemy,
+  python-docutils (>= 0.7), python3-docutils (>= 0.7),
+  python-pygments (>= 1.2), python3-pygments (>= 1.2),
+  python-jinja2 (>= 2.3), python3-jinja2 (>= 2.3),
+  python-sqlalchemy, python3-sqlalchemy,
   python-whoosh,
   python-xapian,
-  python-nose, python (>= 2.6.6-14~) | python-simplejson,
+  python-nose, python3-nose,
+  python (>= 2.6.6-14~) | python-simplejson,
   xvfb, xauth, python-webkit, libjs-jquery (>= 1.4), libjs-underscore,
   texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended,
   perl

Added: packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff	2012-02-12 18:53:17 UTC (rev 20419)
@@ -0,0 +1,22 @@
+Description: Fix build directory for test runner.
+ Hardcode Python 3 build directory in the test runner to the one that Debian
+ package uses.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+
+--- a/tests/run.py
++++ b/tests/run.py
+@@ -14,11 +14,11 @@
+ from os import path, chdir, listdir
+ 
+ if sys.version_info >= (3, 0):
+-    print('Copying and converting sources to build/lib/tests...')
++    print('Copying and converting sources to build/py3/tests...')
+     from distutils.util import copydir_run_2to3
+     testroot = path.dirname(__file__) or '.'
+     newroot = path.join(testroot, path.pardir, 'build')
+-    newroot = path.join(newroot, listdir(newroot)[0], 'tests')
++    newroot = path.join(newroot, 'py3', 'tests')
+     copydir_run_2to3(testroot, newroot)
+     # switch to the converted dir so nose tests the right tests
+     chdir(newroot)

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2012-02-12 18:32:06 UTC (rev 20418)
+++ packages/sphinx/trunk/debian/patches/series	2012-02-12 18:53:17 UTC (rev 20419)
@@ -3,3 +3,4 @@
 show_more_stack_frames.diff
 initialize_autodoc.diff
 sphinxcontrib_namespace.diff
+python3_test_build_dir.diff

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2012-02-12 18:32:06 UTC (rev 20418)
+++ packages/sphinx/trunk/debian/rules	2012-02-12 18:53:17 UTC (rev 20419)
@@ -19,6 +19,7 @@
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
 
 python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
+python3_all = py3versions -r | tr ' ' '\n' | xargs -t -I {} env {}
 
 build-arch:
 
@@ -32,12 +33,13 @@
 	rm -rf build/man
 	cp -rl build/html build/man
 	python ./sphinx-build.py -b man doc build/man
+	python setup.py build --build-lib build/py2/
+	python3 setup.py build --build-lib build/py3/
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(python_all) tests/run.py --verbose --no-skip
+	$(python3_all) tests/run.py --verbose
 	xvfb-run ./debian/jstest/run-tests
 endif
-	python setup.py build --build-lib build/py2/
-	python3 setup.py build --build-lib build/py3/
 	touch build-stamp
 
 clean: