[Python-modules-commits] r23744 - in packages/ipython/trunk/debian (5 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Wed Mar 20 23:46:40 UTC 2013
Date: Wednesday, March 20, 2013 @ 23:46:39
Author: jtaylor-guest
Revision: 23744
New upstream release candidate
Modified:
packages/ipython/trunk/debian/changelog
packages/ipython/trunk/debian/patches/series
Deleted:
packages/ipython/trunk/debian/patches/Added-missing-quotes.patch
packages/ipython/trunk/debian/patches/linenoless-traceback.patch
packages/ipython/trunk/debian/patches/ma-python-cython.patch
Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog 2013-03-20 22:33:20 UTC (rev 23743)
+++ packages/ipython/trunk/debian/changelog 2013-03-20 23:46:39 UTC (rev 23744)
@@ -1,19 +1,17 @@
-ipython (0.13.1-3) experimental; urgency=low
+ipython (0.13.2~rc1-1) experimental; urgency=low
+ * New upstream release candidate
* pass -a to xvfb-run
* drop DM-Upload-Allowed, not needed anymore
* don't link documentation of ipython-doc so ipython3 does not depend on
ipython (Closes: #695554)
Requires ipython-doc.preinst to not lose copyright on upgrade
* add ipython3 and ipython3-qtconsole desktop files (Closes: #693612)
- * ma-python-cython.patch
- fix detection of cython modules for multiarch python (Closes: #697704)
+ * fix detection of cython modules for multiarch python (Closes: #697704)
* don't install tests for notebook and qtconsole
* bump standard to 3.9.4, no changes required
* add autopkgtests
- * Added-missing-quotes.patch: fix missing quotes
- * linenoless-traceback.patch:
- fix crash on tracebacks without line numbers (Closes: #701597)
+ * fix crash on tracebacks without line numbers (Closes: #701597)
* add tkinter package to debianize-error-messages.patch (Closes: #701707)
* add more autopkgtests testing profile creation and cython magics
Deleted: packages/ipython/trunk/debian/patches/Added-missing-quotes.patch
===================================================================
--- packages/ipython/trunk/debian/patches/Added-missing-quotes.patch 2013-03-20 22:33:20 UTC (rev 23743)
+++ packages/ipython/trunk/debian/patches/Added-missing-quotes.patch 2013-03-20 23:46:39 UTC (rev 23744)
@@ -1,19 +0,0 @@
-Description: Added missing quotes.
-Author: David Hirschfeld <david.hirschfeld at gazprom-mt.com>
-Origin: 7fadfdad2abd2865df7727de3c4e3176b43932cf
-
----
- IPython/parallel/client/client.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/IPython/parallel/client/client.py
-+++ b/IPython/parallel/client/client.py
-@@ -1550,7 +1550,7 @@ class Client(HasTraits):
- elif header['msg_type'] == 'execute_reply':
- res = ExecuteReply(msg_id, rcontent, md)
- else:
-- raise KeyError("unhandled msg type: %r" % header[msg_type])
-+ raise KeyError("unhandled msg type: %r" % header['msg_type'])
- else:
- res = self._unwrap_exception(rcontent)
- failures.append(res)
Deleted: packages/ipython/trunk/debian/patches/linenoless-traceback.patch
===================================================================
--- packages/ipython/trunk/debian/patches/linenoless-traceback.patch 2013-03-20 22:33:20 UTC (rev 23743)
+++ packages/ipython/trunk/debian/patches/linenoless-traceback.patch 2013-03-20 23:46:39 UTC (rev 23744)
@@ -1,26 +0,0 @@
-Description: fix tracebacks without line numbers
- e.g. from lxml import etree; tree = etree.fromstring('<a></a>'); tree.find('/')
-Origin: 47260f547506dc3a871fa49b9302f6ab7f431b0c
-Bug: https://github.com/ipython/ipython/pull/2503
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701597
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-
---- a/IPython/core/ultratb.py
-+++ b/IPython/core/ultratb.py
-@@ -567,10 +567,14 @@ class ListTB(TBTools):
- have_filedata = True
- #print 'filename is',filename # dbg
- if not value.filename: value.filename = "<string>"
-- list.append('%s File %s"%s"%s, line %s%d%s\n' % \
-+ if value.lineno:
-+ lineno = value.lineno
-+ else:
-+ lineno = 'unknown'
-+ list.append('%s File %s"%s"%s, line %s%s%s\n' % \
- (Colors.normalEm,
- Colors.filenameEm, value.filename, Colors.normalEm,
-- Colors.linenoEm, value.lineno, Colors.Normal ))
-+ Colors.linenoEm, lineno, Colors.Normal ))
- if value.text is not None:
- i = 0
- while i < len(value.text) and value.text[i].isspace():
Deleted: packages/ipython/trunk/debian/patches/ma-python-cython.patch
===================================================================
--- packages/ipython/trunk/debian/patches/ma-python-cython.patch 2013-03-20 22:33:20 UTC (rev 23743)
+++ packages/ipython/trunk/debian/patches/ma-python-cython.patch 2013-03-20 23:46:39 UTC (rev 23744)
@@ -1,43 +0,0 @@
-Description: fix cython module so extension for python3.3
- imp.get_suffixes() returns all kind of junk, the first is not correct anymore
-Origin: backported from a1daa0286a867cda86e728e177d72a645b72c634
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-
---- a/IPython/extensions/cythonmagic.py
-+++ b/IPython/extensions/cythonmagic.py
-@@ -146,7 +146,18 @@ class CythonMagics(Magics):
- ctx = Context(cython_include_dirs, default_options)
- key = code, sys.version_info, sys.executable, Cython.__version__
- module_name = "_cython_magic_" + hashlib.md5(str(key).encode('utf-8')).hexdigest()
-- so_ext = [ ext for ext,_,mod_type in imp.get_suffixes() if mod_type == imp.C_EXTENSION ][0]
-+
-+ dist = Distribution()
-+ config_files = dist.find_config_files()
-+ try:
-+ config_files.remove('setup.cfg')
-+ except ValueError:
-+ pass
-+ dist.parse_config_files(config_files)
-+ build_extension = build_ext(dist)
-+ build_extension.finalize_options()
-+
-+ so_ext = build_extension.get_ext_filename('')
- module_path = os.path.join(lib_dir, module_name+so_ext)
-
- if not os.path.exists(lib_dir):
-@@ -168,15 +179,6 @@ class CythonMagics(Magics):
- extra_compile_args = args.compile_args,
- libraries = args.lib,
- )
-- dist = Distribution()
-- config_files = dist.find_config_files()
-- try:
-- config_files.remove('setup.cfg')
-- except ValueError:
-- pass
-- dist.parse_config_files(config_files)
-- build_extension = build_ext(dist)
-- build_extension.finalize_options()
- try:
- build_extension.extensions = cythonize([extension], ctx=ctx, quiet=quiet)
- except CompileError:
Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series 2013-03-20 22:33:20 UTC (rev 23743)
+++ packages/ipython/trunk/debian/patches/series 2013-03-20 23:46:39 UTC (rev 23744)
@@ -5,6 +5,3 @@
use-system-mathjax-if-available.patch
parallel-2to3.patch
shared-static-path.patch
-ma-python-cython.patch
-Added-missing-quotes.patch
-linenoless-traceback.patch
More information about the Python-modules-commits
mailing list