[Python-modules-commits] [matplotlib] 11/11: run tests using tests.py, and disable those accessing the network

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository matplotlib.

commit b6e0203ef509f1f26fd19491006655657f85c837
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Jan 5 22:49:09 2016 +0000

    run tests using tests.py, and disable those accessing the network
---
 debian/changelog | 4 +++-
 debian/rules     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df6648a..28550c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ matplotlib (1.5.1~rc1-1) UNRELEASED; urgency=medium
   * debian/copyright
     - extend packaging copyright years
     - add/remove stanzas for new upstream code
+  * debian/rules
+    - run tests using tests.py, and disable those accessing the network
 
- -- Sandro Tosi <morph at debian.org>  Mon, 04 Jan 2016 21:47:13 +0000
+ -- Sandro Tosi <morph at debian.org>  Tue, 05 Jan 2016 22:48:31 +0000
 
 matplotlib (1.5.0~rc2-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index fa5fe4a..ba72d77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 					print(b.build_platlib)") \
 	MATPLOTLIBDATA=$(CURDIR)/lib/matplotlib/mpl-data/ \
 	MPLCONFIGDIR=. \
-		xvfb-run -a python$* -c "import matplotlib as m ; m.test(verbosity=1)"
+		xvfb-run -a python$* tests.py --eval-attr="not network"
 
 	-PYTHONPATH=$(shell python$*-dbg -c "from distutils.command.build import build ; \
 	                                    from distutils.core import Distribution ; \
@@ -53,7 +53,7 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 					    print(b.build_platlib)") \
 	MATPLOTLIBDATA=$(CURDIR)/lib/matplotlib/mpl-data/ \
 	MPLCONFIGDIR=. \
-		xvfb-run -a python$*-dbg -c "import matplotlib as m ; m.test(verbosity=1)"
+		xvfb-run -a python$*-dbg tests.py --eval-attr="not network"
 	rm -f matplotlibrc
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git