[Python-modules-commits] r10833 - in packages/logilab-common/trunk/debian (changelog rules)

[morph at users.alioth.debian.org]

    Date: Saturday, December 19, 2009 @ 13:33:00
  Author: morph
Revision: 10833

* debian/rules
  - use an unversioned build/lib directory for building (from Ubuntu); thanks
    to Jakub Wilk for the report and link to patch; Closes: #558096
  - run tests using the directory of the default Python version

Modified:
  packages/logilab-common/trunk/debian/changelog
  packages/logilab-common/trunk/debian/rules

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2009-12-19 12:45:22 UTC (rev 10832)
+++ packages/logilab-common/trunk/debian/changelog	2009-12-19 13:33:00 UTC (rev 10833)
@@ -1,8 +1,12 @@
 logilab-common (0.45.2-1) unstable; urgency=low
 
   * New upstream release
+  * debian/rules
+    - use an unversioned build/lib directory for building (from Ubuntu); thanks
+      to Jakub Wilk for the report and link to patch; Closes: #558096
+    - run tests using the directory of the default Python version
 
- -- Sandro Tosi <morph at debian.org>  Sat, 19 Dec 2009 12:39:41 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 19 Dec 2009 14:32:36 +0100
 
 logilab-common (0.45.1-1) unstable; urgency=low
 

Modified: packages/logilab-common/trunk/debian/rules
===================================================================
--- packages/logilab-common/trunk/debian/rules	2009-12-19 12:45:22 UTC (rev 10832)
+++ packages/logilab-common/trunk/debian/rules	2009-12-19 13:33:00 UTC (rev 10833)
@@ -11,19 +11,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Python default version number
+PYDEF := $(shell pyversions -d -v)
+
 build: build-stamp
 build-stamp: 
 	dh_testdir
 	
 	# python module build
-	NO_SETUPTOOLS=1 python setup.py -q build
+	NO_SETUPTOOLS=1 python setup.py -q build --build-purelib build/lib
 
 	# run tests
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	# we need this hack because we have to import "logilab.common.pytest"
 	# but since it's a namespace package, we need to "simulate" it
 	touch $(CURDIR)/build/lib/logilab/__init__.py
-	-PYTHONPATH=$(CURDIR)/build/lib/ $(CURDIR)/build/scripts-2.5/pytest
+	# use the default python version to select the script dir to run the tests
+	-PYTHONPATH=$(CURDIR)/build/lib/ $(CURDIR)/build/scripts-$(PYDEF)/pytest
 	rm -f $(CURDIR)/build/lib/logilab/__init__.py
 endif