[Python-modules-commits] r27919 - in packages/ipython/trunk/debian (4 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, February 25, 2014 @ 00:51:32
  Author: jtaylor-guest
Revision: 27919

debianize parallel error messages for missing zmq (LP: #1190231)

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/debianize-error-messages.patch
  packages/ipython/trunk/debian/tests/control
  packages/ipython/trunk/debian/tests/tools

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2014-02-25 00:51:27 UTC (rev 27918)
+++ packages/ipython/trunk/debian/changelog	2014-02-25 00:51:32 UTC (rev 27919)
@@ -2,6 +2,7 @@
 
   * New upstream bugfix release
   * suggest pgf for nbconvert --to latex --post pdf
+  * debianize parallel error messages for missing zmq (LP: #1190231)
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 06 Feb 2014 01:45:52 +0100
 

Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2014-02-25 00:51:27 UTC (rev 27918)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2014-02-25 00:51:32 UTC (rev 27919)
@@ -69,3 +69,22 @@
          )
      out, _ = p.communicate(cast_bytes(source, encoding))
      out = TextIOWrapper(BytesIO(out), encoding, 'replace').read()
+--- a/IPython/parallel/__init__.py
++++ b/IPython/parallel/__init__.py
+@@ -17,8 +17,15 @@ Authors:
+ 
+ import os
+ import warnings
++import sys
+ 
+-import zmq
++try:
++    import zmq
++except ImportError:
++    from IPython.utils import py3compat
++    _py = "python3" if py3compat.PY3 else "python"
++    print "Coult not import zmq module, please install %s-zmq" % _py
++    sys.exit(1)
+ 
+ from IPython.config.configurable import MultipleInstanceError
+ from IPython.utils.zmqrelated import check_for_zmq

Modified: packages/ipython/trunk/debian/tests/control
===================================================================
--- packages/ipython/trunk/debian/tests/control	2014-02-25 00:51:27 UTC (rev 27918)
+++ packages/ipython/trunk/debian/tests/control	2014-02-25 00:51:32 UTC (rev 27919)
@@ -37,10 +37,10 @@
 Depends: ipython3, cython3, python3-dev, python-pexpect
 
 Tests: tools2
-Depends: ipython, python-lxml
+Depends: ipython, python-lxml, python-zmq
 
 Tests: tools3
-Depends: ipython3, python3-lxml
+Depends: ipython3, python3-lxml, python3-zmq
 
 Tests: incomplete-install
 Depends: ipython, ipython3

Modified: packages/ipython/trunk/debian/tests/tools
===================================================================
--- packages/ipython/trunk/debian/tests/tools	2014-02-25 00:51:27 UTC (rev 27918)
+++ packages/ipython/trunk/debian/tests/tools	2014-02-25 00:51:32 UTC (rev 27919)
@@ -7,9 +7,11 @@
 if [ "$1" = "ipython" ]; then
 IPYTHON=ipython
 IRUNNER=irunner
+IPCLUSTER=ipcluster
 elif [ "$1" = "ipython3" ]; then
 IPYTHON=ipython3
 IRUNNER=irunner3
+IPCLUSTER=ipcluster3
 fi
 
 $IPYTHON locate
@@ -28,3 +30,4 @@
 $IRUNNER test.py
 $IRUNNER --ipython test.py
 
+$IPCLUSTER --help