[Python-modules-commits] r19652 - in packages/ipython/trunk/debian (8 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Mon Dec 19 20:10:51 UTC 2011
Date: Monday, December 19, 2011 @ 20:10:49
Author: jtaylor-guest
Revision: 19652
prepare 0.12 package
refresh patches
parallel example folder renamed newparallel -> parallel
drop upstream applied fix-version-checks-for-pyzmq-2.1.10.patch
Added:
packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
Modified:
packages/ipython/trunk/debian/ipython-parallel.examples
packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
packages/ipython/trunk/debian/patches/debianize-error-messages.patch
packages/ipython/trunk/debian/patches/series
packages/ipython/trunk/debian/rules
Deleted:
packages/ipython/trunk/debian/patches/07_use_lightbg.patch
packages/ipython/trunk/debian/patches/fix-version-checks-for-pyzmq-2.1.10.patch
Modified: packages/ipython/trunk/debian/ipython-parallel.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-parallel.examples 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/ipython-parallel.examples 2011-12-19 20:10:49 UTC (rev 19652)
@@ -1 +1 @@
-debian/tmp/usr/share/doc/ipython/examples/newparallel
+debian/tmp/usr/share/doc/ipython/examples/parallel
Modified: packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch 2011-12-19 20:10:49 UTC (rev 19652)
@@ -1,12 +1,21 @@
-Author: Stephan Peijnik
-Comment:
- Fixes missing shebang in seteditor.py example script.
+From: Stephan Peijnik <debian at sp.or.at>
+Date: Wed, 19 Oct 2011 18:37:25 +0200
+Subject: 05_fix_seteditor_example
---- ipython-0.9.1.orig/docs/examples/core/seteditor.py 2008-09-19 17:32:19.531743653 +0200
-+++ ipython-0.9.1/docs/examples/core/seteditor.py 2008-09-19 17:32:26.679744387 +0200
+Fixes missing shebang in seteditor.py example script
+
+---
+ docs/examples/core/seteditor.py | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/docs/examples/core/seteditor.py b/docs/examples/core/seteditor.py
+index a2cde04..75c7e7d 100644
+--- a/docs/examples/core/seteditor.py
++++ b/docs/examples/core/seteditor.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
import os
+--
Deleted: packages/ipython/trunk/debian/patches/07_use_lightbg.patch
===================================================================
--- packages/ipython/trunk/debian/patches/07_use_lightbg.patch 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/patches/07_use_lightbg.patch 2011-12-19 20:10:49 UTC (rev 19652)
@@ -1,19 +0,0 @@
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/241535
-Subject: use LightBG colorscheme by default
- Linux scheme leads to invisible text when console background is light
- LightBG is at least readable with dark background
-
-Index: trunk/IPython/core/interactiveshell.py
-===================================================================
---- trunk.orig/IPython/core/interactiveshell.py 2011-06-23 10:55:25.000000000 +0200
-+++ trunk/IPython/core/interactiveshell.py 2011-06-23 10:58:33.033373573 +0200
-@@ -119,7 +119,7 @@
- elif os.name=='nt':
- return 'Linux'
- else:
-- return 'Linux'
-+ return 'LightBG'
-
-
- class SeparateUnicode(Unicode):
Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2011-12-19 20:10:49 UTC (rev 19652)
@@ -1,8 +1,12 @@
From: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Thu, 7 Jul 2011 18:19:04 +0200
Subject: debianize error messages
-Forwarded: not-needed
+---
+ IPython/scripts/ipython | 6 +++++-
+ IPython/zmq/__init__.py | 4 ++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
--- a/IPython/scripts/ipython
+++ b/IPython/scripts/ipython
@@ -4,4 +4,11 @@
@@ -20,7 +24,7 @@
+ raise
--- a/IPython/zmq/__init__.py
+++ b/IPython/zmq/__init__.py
-@@ -18,13 +18,13 @@
+@@ -16,12 +16,12 @@
try:
import zmq
except ImportError:
@@ -28,11 +32,10 @@
+ raise ImportError("%s requires python-zmq >= %s"%(module, minimum_version))
pyzmq_version = zmq.__version__
- vlist = [int(n) for n in re.findall(r'\d+', pyzmq_version)]
-
- if 'dev' not in pyzmq_version and vlist < min_vlist:
+
+ if 'dev' not in pyzmq_version and V(pyzmq_version) < V(minimum_version):
- raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
+ raise ImportError("%s requires python-zmq >= %s, but you have %s"%(
module, minimum_version, pyzmq_version))
- if zmq.zmq_version() >= '3.0.0':
+ # fix missing DEALER/ROUTER aliases in pyzmq < 2.1.9
Deleted: packages/ipython/trunk/debian/patches/fix-version-checks-for-pyzmq-2.1.10.patch
===================================================================
--- packages/ipython/trunk/debian/patches/fix-version-checks-for-pyzmq-2.1.10.patch 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/patches/fix-version-checks-for-pyzmq-2.1.10.patch 2011-12-19 20:10:49 UTC (rev 19652)
@@ -1,121 +0,0 @@
-From 795089a8ee040f10f35a8f5bedaec1cdbac9f7e0 Mon Sep 17 00:00:00 2001
-From: MinRK <benjaminrk at gmail.com>
-Date: Sun, 4 Sep 2011 00:22:59 -0700
-Subject: [PATCH] fix version checks for pyzmq 2.10
-
----
- IPython/parallel/__init__.py | 16 +++++-----------
- IPython/zmq/__init__.py | 34 ++++++++++++++++++----------------
- setupext/setupext.py | 14 +++++++++++++-
- 3 files changed, 36 insertions(+), 28 deletions(-)
-
-diff --git a/IPython/parallel/__init__.py b/IPython/parallel/__init__.py
-index 13ef12f..4cb507d 100644
---- a/IPython/parallel/__init__.py
-+++ b/IPython/parallel/__init__.py
-@@ -20,20 +20,14 @@ import warnings
-
- import zmq
-
-+from IPython.zmq import check_for_zmq
-
- if os.name == 'nt':
-- if zmq.__version__ < '2.1.7':
-- raise ImportError("IPython.parallel requires pyzmq/0MQ >= 2.1.7 on Windows, "
-- "and you appear to have %s"%zmq.__version__)
--elif zmq.__version__ < '2.1.4':
-- raise ImportError("IPython.parallel requires pyzmq/0MQ >= 2.1.4, you appear to have %s"%zmq.__version__)
--
--if zmq.zmq_version() >= '3.0.0':
-- warnings.warn("""libzmq 3 detected.
-- It is unlikely that IPython's zmq code will work properly.
-- Please install libzmq stable, which is 2.1.x or 2.2.x""",
-- RuntimeWarning)
-+ min_pyzmq = '2.1.7'
-+else:
-+ min_pyzmq = '2.1.4'
-
-+check_for_zmq(min_pyzmq, 'IPython.parallel')
-
- from IPython.utils.pickleutil import Reference
-
-diff --git a/IPython/zmq/__init__.py b/IPython/zmq/__init__.py
-index e9ad6bf..0b0355a 100644
---- a/IPython/zmq/__init__.py
-+++ b/IPython/zmq/__init__.py
-@@ -9,26 +9,28 @@
- # Verify zmq version dependency >= 2.1.4
- #-----------------------------------------------------------------------------
-
-+import re
- import warnings
-
--minimum_pyzmq_version = "2.1.4"
-+def check_for_zmq(minimum_version, module='IPython.zmq'):
-+ min_vlist = [int(n) for n in minimum_version.split('.')]
-
--try:
-- import zmq
--except ImportError:
-- raise ImportError("IPython.zmq requires pyzmq >= %s"%minimum_pyzmq_version)
-+ try:
-+ import zmq
-+ except ImportError:
-+ raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))
-
--pyzmq_version = zmq.__version__
-+ pyzmq_version = zmq.__version__
-+ vlist = [int(n) for n in re.findall(r'\d+', pyzmq_version)]
-
--if pyzmq_version < minimum_pyzmq_version:
-- raise ImportError("IPython.zmq requires pyzmq >= %s, but you have %s"%(
-- minimum_pyzmq_version, pyzmq_version))
-+ if 'dev' not in pyzmq_version and vlist < min_vlist:
-+ raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
-+ module, minimum_version, pyzmq_version))
-
--del pyzmq_version
--
--if zmq.zmq_version() >= '3.0.0':
-- warnings.warn("""libzmq 3 detected.
-- It is unlikely that IPython's zmq code will work properly.
-- Please install libzmq stable, which is 2.1.x or 2.2.x""",
-- RuntimeWarning)
-+ if zmq.zmq_version() >= '3.0.0':
-+ warnings.warn("""libzmq 3 detected.
-+ It is unlikely that IPython's zmq code will work properly.
-+ Please install libzmq stable, which is 2.1.x or 2.2.x""",
-+ RuntimeWarning)
-
-+check_for_zmq('2.1.4')
-diff --git a/setupext/setupext.py b/setupext/setupext.py
-index 93a0adf..a5bb7de 100644
---- a/setupext/setupext.py
-+++ b/setupext/setupext.py
-@@ -139,10 +139,22 @@ def check_for_pyzmq():
- print_status('pyzmq', "no (required for qtconsole and parallel computing capabilities)")
- return False
- else:
-+ # pyzmq 2.1.10 adds pyzmq_version_info funtion for returning
-+ # version as a tuple
-+ if hasattr(zmq, 'pyzmq_version_info'):
-+ if zmq.pyzmq_version_info() >= (2,1,4):
-+ print_status("pyzmq", zmq.__version__)
-+ return True
-+ else:
-+ # this branch can never occur, at least until we update our
-+ # pyzmq dependency beyond 2.1.10
-+ return False
-+ # this is necessarily earlier than 2.1.10, so string comparison is
-+ # okay
- if zmq.__version__ < '2.1.4':
- print_status('pyzmq', "no (have %s, but require >= 2.1.4 for"
- " qtconsole and parallel computing capabilities)"%zmq.__version__)
--
-+ return False
- else:
- print_status("pyzmq", zmq.__version__)
- return True
---
-1.7.5.4
-
Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/patches/series 2011-12-19 20:10:49 UTC (rev 19652)
@@ -1,4 +1,3 @@
05_fix_seteditor_example.patch
-07_use_lightbg.patch
-fix-version-checks-for-pyzmq-2.1.10.patch
+use-LightBG-colorscheme.patch
debianize-error-messages.patch
Added: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch (rev 0)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2011-12-19 20:10:49 UTC (rev 19652)
@@ -0,0 +1,24 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Wed, 19 Oct 2011 18:37:25 +0200
+Subject: use LightBG colorscheme
+
+by default Linux scheme leads to invisible text when console background
+is light LightBG is at least readable with dark background
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/241535
+
+---
+ IPython/core/interactiveshell.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/IPython/core/interactiveshell.py
++++ b/IPython/core/interactiveshell.py
+@@ -125,7 +125,7 @@
+ elif os.name=='nt':
+ return 'Linux'
+ else:
+- return 'Linux'
++ return 'LightBG'
+
+
+ class SeparateUnicode(Unicode):
Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules 2011-12-18 15:03:05 UTC (rev 19651)
+++ packages/ipython/trunk/debian/rules 2011-12-19 20:10:49 UTC (rev 19652)
@@ -90,7 +90,7 @@
endif
override_dh_installexamples:
- dh_installexamples -pipython --exclude="examples/newparallel/"
+ dh_installexamples -pipython --exclude="examples/parallel/"
dh_installexamples -pipython-parallel
override_dh_sphinxdoc:
More information about the Python-modules-commits
mailing list