[Python-modules-commits] r21843 - in packages/matplotlib/trunk/debian (changelog rules)

[morph at users.alioth.debian.org]

    Date: Sunday, May 20, 2012 @ 17:42:43
  Author: morph
Revision: 21843

* debian/rules
  - enable tests at build time

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2012-05-20 16:38:50 UTC (rev 21842)
+++ packages/matplotlib/trunk/debian/changelog	2012-05-20 17:42:43 UTC (rev 21843)
@@ -6,8 +6,10 @@
     - remove Qt3 dependencies, not required since a long time, easying Qt3
       removal from Debian; thanks to Ana Guerrero for report; Closes: #673399
     - add python-nose to b-d, needed to run tests
+  * debian/rules
+    - enable tests at build time
 
- -- Sandro Tosi <morph at debian.org>  Sun, 20 May 2012 15:33:44 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 20 May 2012 19:42:12 +0200
 
 matplotlib (1.1.1~rc1-2) unstable; urgency=low
 

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2012-05-20 16:38:50 UTC (rev 21842)
+++ packages/matplotlib/trunk/debian/rules	2012-05-20 17:42:43 UTC (rev 21843)
@@ -34,13 +34,28 @@
 	python$* ./setup.py build $(PY_BUILD_FLAGS)
 	python$*-dbg ./setup.py build $(PY_BUILD_FLAGS)
 
-#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-#	LIB=$$(python$$* -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_purelib")
-#	PYTHONPATH=$$LIB python$* -c "import matplotlib as m ; m.test(verbosity=1)"
-#	LIB=$$(python$$*-dbg -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_purelib")
-#	PYTHONPATH=$$LIB python$*-dbg -c "import matplotlib as m ; m.test(verbosity=1)"
-#endif
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	echo "datapath : $(CURDIR)/lib/matplotlib/mpl-data/" > matplotlibrc
+	-PYTHONPATH=$(shell python$* -c "from distutils.command.build import build ; \
+	                                from distutils.core import Distribution ; \
+					b = build(Distribution()) ; \
+					b.finalize_options() ; \
+					print b.build_platlib") \
+	MATPLOTLIBDATA=$(CURDIR)/lib/matplotlib/mpl-data/ \
+	MPLCONFIGDIR=. \
+		python$* -c "import matplotlib as m ; m.test(verbosity=1)"
 
+	-PYTHONPATH=$(shell python$*-dbg -c "from distutils.command.build import build ; \
+	                                    from distutils.core import Distribution ; \
+					    b = build(Distribution()) ; \
+					    b.finalize_options() ; \
+					    print b.build_platlib") \
+	MATPLOTLIBDATA=$(CURDIR)/lib/matplotlib/mpl-data/ \
+	MPLCONFIGDIR=. \
+		python$*-dbg -c "import matplotlib as m ; m.test(verbosity=1)"
+	rm -f matplotlibrc
+endif
+
 	touch $@