[Python-modules-commits] r15118 - in packages/sphinx/branches/1.0/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, December 18, 2010 @ 16:54:02
  Author: jwilk
Revision: 15118

Run tests at build time.

Modified:
  packages/sphinx/branches/1.0/debian/changelog
  packages/sphinx/branches/1.0/debian/control
  packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch
  packages/sphinx/branches/1.0/debian/rules

Modified: packages/sphinx/branches/1.0/debian/changelog
===================================================================
--- packages/sphinx/branches/1.0/debian/changelog	2010-12-18 15:44:16 UTC (rev 15117)
+++ packages/sphinx/branches/1.0/debian/changelog	2010-12-18 16:54:02 UTC (rev 15118)
@@ -12,11 +12,16 @@
     + Drop quilt from build-depends.
   * Update debian/copyright.
   * Use DEP-3 format for patch headers.
+  * Run tests at build time.
+    + Add python-nose and python-simplejson to Build-Depends-Indep.
+    + Patch test runner to import modules correctly and prevent it from
+      reading files in /usr/share/sphinx.
+    + Update debian/rules.
 
   [ Stefano Rivera ]
   * Improve language and clarify options in manpages.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 18 Dec 2010 14:23:14 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 18 Dec 2010 17:52:00 +0100
 
 sphinx (1.0.1-1) experimental; urgency=low
 

Modified: packages/sphinx/branches/1.0/debian/control
===================================================================
--- packages/sphinx/branches/1.0/debian/control	2010-12-18 15:44:16 UTC (rev 15117)
+++ packages/sphinx/branches/1.0/debian/control	2010-12-18 16:54:02 UTC (rev 15118)
@@ -5,7 +5,8 @@
 Uploaders: Jakub Wilk <jwilk at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Homepage: http://sphinx.pocoo.org/
 Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~)
-Build-Depends-Indep: python-support (>= 0.6.4), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1)
+Build-Depends-Indep: python-support (>= 0.6.4), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1),
+  python-nose, python-simplejson
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/branches/1.0/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sphinx/branches/1.0/

Modified: packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2010-12-18 15:44:16 UTC (rev 15117)
+++ packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2010-12-18 16:54:02 UTC (rev 15118)
@@ -14,3 +14,17 @@
  
  if '+' in __version__ or 'pre' in __version__:
      # try to find out the changeset hash if checked out from hg, and append
+--- a/tests/run.py
++++ b/tests/run.py
+@@ -14,7 +14,10 @@
+ from os import path
+ 
+ # always test the sphinx package from this directory
+-sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
++sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), path.pardir)))
++
++import sphinx
++sphinx.package_dir = path.join(sys.path[0], 'sphinx')
+ 
+ try:
+     import nose

Modified: packages/sphinx/branches/1.0/debian/rules
===================================================================
--- packages/sphinx/branches/1.0/debian/rules	2010-12-18 15:44:16 UTC (rev 15117)
+++ packages/sphinx/branches/1.0/debian/rules	2010-12-18 16:54:02 UTC (rev 15118)
@@ -13,6 +13,12 @@
 	dh_testdir
 	mkdir -p _build/html
 	PYTHONPATH=. python debian/sphinx-build-local.py doc _build/html
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e -x; \
+	for python in $(shell pyversions -r); do \
+		$$python tests/run.py; \
+	done
+endif
 	touch build-stamp
 
 clean: