[Python-modules-commits] r28746 - in packages/ipython/trunk/debian (12 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Sat May 3 15:40:59 UTC 2014
Date: Saturday, May 3, 2014 @ 15:40:58
Author: jtaylor-guest
Revision: 28746
New upstream release
Modified:
packages/ipython/trunk/debian/changelog
packages/ipython/trunk/debian/patches/debianize-error-messages.patch
packages/ipython/trunk/debian/patches/no-submodule-check.patch
packages/ipython/trunk/debian/patches/series
packages/ipython/trunk/debian/patches/shared-static-path.patch
packages/ipython/trunk/debian/patches/test-default-tk.patch
packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch
packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
Deleted:
packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
packages/ipython/trunk/debian/patches/packaged-lessc.patch
packages/ipython/trunk/debian/patches/parallel-2to3.patch
Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/changelog 2014-05-03 15:40:58 UTC (rev 28746)
@@ -1,3 +1,9 @@
+ipython (2.0.0-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sat, 03 May 2014 14:24:25 +0200
+
ipython (1.2.1-2) unstable; urgency=medium
* debianize-error-messages.patch: fix no zmq message to raise an exception
Deleted: packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -1,14 +0,0 @@
-From: Stephan Peijnik <debian at sp.or.at>
-Date: Wed, 19 Oct 2011 18:37:25 +0200
-Subject: 05_fix_seteditor_example
-
-Fixes missing shebang in seteditor.py example script
-
---- a/examples/core/seteditor.py
-+++ b/examples/core/seteditor.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/python
-+
- import os
-
-
Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -5,7 +5,7 @@
--- a/IPython/config/application.py
+++ b/IPython/config/application.py
-@@ -540,9 +540,19 @@ class Application(SingletonConfigurable)
+@@ -558,9 +558,19 @@ class Application(SingletonConfigurable)
If a global instance already exists, this reinitializes and starts it
"""
@@ -20,9 +20,9 @@
+ from IPython.utils import py3compat
+ ipy = "ipython3" if py3compat.PY3 else "ipython"
+ if "IPython.qt" in str(e) or "qt.console.qtconsoleapp" in str(e):
-+ print "Could not start qtconsole. Please install %s-qtconsole" % ipy
++ print("Could not start qtconsole. Please install %s-qtconsole" % ipy)
+ elif "IPython.html" in str(e) or "html.notebookapp" in str(e):
-+ print "Could not start notebook. Please install %s-notebook" % ipy
++ print("Could not start notebook. Please install %s-notebook" % ipy)
+ else:
+ raise
@@ -30,15 +30,15 @@
# utility functions, for convenience
--- a/IPython/lib/clipboard.py
+++ b/IPython/lib/clipboard.py
-@@ -44,7 +44,7 @@ def tkinter_clipboard_get():
- import Tkinter
- except ImportError:
- raise TryNext("Getting text from the clipboard on this platform "
-- "requires Tkinter.")
-+ "requires the %s-tk package." % ("python3" if py3compat.PY3 else "python"))
- root = Tkinter.Tk()
+@@ -57,7 +57,7 @@ def tkinter_clipboard_get():
+ from Tkinter import Tk, TclError # Py 2
+ except ImportError:
+ raise TryNext("Getting text from the clipboard on this platform "
+- "requires Tkinter.")
++ "requires the %s-tk package." % ("python3" if py3compat.PY3 else "python"))
+ root = Tk()
root.withdraw()
- text = root.clipboard_get()
+ try:
--- a/IPython/utils/zmqrelated.py
+++ b/IPython/utils/zmqrelated.py
@@ -34,13 +34,13 @@ def check_for_zmq(minimum_version, requi
@@ -57,31 +57,3 @@
+ raise ImportError("%s requires python-zmq >= %s, but you have %s"%(
required_by, minimum_version, pyzmq_version))
---- a/IPython/nbconvert/utils/pandoc.py
-+++ b/IPython/nbconvert/utils/pandoc.py
-@@ -61,8 +61,7 @@ def pandoc(source, fmt, to, extra_args=N
- except OSError as e:
- raise PandocMissing(
- "The command '%s' returned an error: %s.\n" %(" ".join(command), e) +
-- "Please check that pandoc is installed:\n" +
-- "http://johnmacfarlane.net/pandoc/installing.html"
-+ "Please check that pandoc package is installed."
- )
- out, _ = p.communicate(cast_bytes(source, encoding))
- out = TextIOWrapper(BytesIO(out), encoding, 'replace').read()
---- a/IPython/parallel/__init__.py
-+++ b/IPython/parallel/__init__.py
-@@ -18,7 +18,12 @@ Authors:
- import os
- import warnings
-
--import zmq
-+try:
-+ import zmq
-+except ImportError:
-+ from IPython.utils import py3compat
-+ _py = "python3" if py3compat.PY3 else "python"
-+ raise ImportError("Could not import zmq module, please install %s-zmq" % _py)
-
- from IPython.config.configurable import MultipleInstanceError
- from IPython.utils.zmqrelated import check_for_zmq
Modified: packages/ipython/trunk/debian/patches/no-submodule-check.patch
===================================================================
--- packages/ipython/trunk/debian/patches/no-submodule-check.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/no-submodule-check.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -1,9 +1,7 @@
-Description: skip git submodule check
- make no sense for a package
--- a/IPython/html/notebookapp.py
+++ b/IPython/html/notebookapp.py
-@@ -654,15 +654,7 @@ class NotebookApp(BaseIPythonApplication
- print self.notebook_info()
+@@ -738,14 +738,7 @@ class NotebookApp(BaseIPythonApplication
+ print(self.notebook_info())
def init_components(self):
- """Check the components submodule, and warn if it's unclean"""
@@ -14,7 +12,6 @@
- elif status == 'unclean':
- self.log.warn("components submodule unclean, you may see 404s on static/components")
- self.log.warn("run `setup.py submodule` or `git submodule update` to update")
--
+ pass
@catch_config_error
Deleted: packages/ipython/trunk/debian/patches/packaged-lessc.patch
===================================================================
--- packages/ipython/trunk/debian/patches/packaged-lessc.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/packaged-lessc.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -1,23 +0,0 @@
-Description: use packaged lessc compiler and uglifyjs
---- a/IPython/html/fabfile.py
-+++ b/IPython/html/fabfile.py
-@@ -27,7 +27,7 @@ def _compile_less(source, target, minify
- verbose = _to_bool(verbose)
- min_flag = '-x' if minify is True else ''
- ver_flag = '--verbose' if verbose is True else ''
-- lessc = os.path.join('components', 'less.js', 'bin', 'lessc')
-+ lessc = 'lessc'
- with lcd(static_dir):
- local('{lessc} {min_flag} {ver_flag} {source} {target}'.format(**locals()))
-
---- a/IPython/html/static/components/bootstrap/Makefile
-+++ b/IPython/html/static/components/bootstrap/Makefile
-@@ -73,7 +73,7 @@ bootstrap-js: bootstrap/js/*.js
- bootstrap/js/*.js: js/*.js
- mkdir -p bootstrap/js
- cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js
-- ./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
-+ uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
- echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
- cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
- rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
Deleted: packages/ipython/trunk/debian/patches/parallel-2to3.patch
===================================================================
--- packages/ipython/trunk/debian/patches/parallel-2to3.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/parallel-2to3.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -1,24 +0,0 @@
-Description: allow running 2to3 in parallel
-Author: Jakub Wilk
-Forwarded: takowl at gmail.com
-
---- a/setup.py
-+++ b/setup.py
-@@ -319,6 +319,17 @@ if 'setuptools' in sys.modules:
- "ipython_win_post_install.py"}}
-
- if PY3:
-+ num_processes = 1
-+ for option in os.environ.get('DEB_BUILD_OPTIONS', '').split():
-+ if option.startswith('parallel='):
-+ num_processes = int(option.split('=', 1)[1])
-+ if num_processes > 1:
-+ import lib2to3.refactor
-+ class RefactoringTool(lib2to3.refactor.MultiprocessRefactoringTool):
-+ def refactor(self, items, write=False, doctests_only=False):
-+ return lib2to3.refactor.MultiprocessRefactoringTool.refactor(self, items, write=write, num_processes=num_processes,
-+ doctests_only=doctests_only)
-+ lib2to3.refactor.RefactoringTool = RefactoringTool
- setuptools_extra_args['use_2to3'] = True
- # we try to make a 2.6, 2.7, and 3.1 to 3.3 python compatible code
- # so we explicitly disable some 2to3 fixes to be sure we aren't forgetting
Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/series 2014-05-03 15:40:58 UTC (rev 28746)
@@ -1,10 +1,7 @@
-packaged-lessc.patch
-05_fix_seteditor_example.patch
use-LightBG-colorscheme.patch
debianize-error-messages.patch
use-ipython-icon-in-desktop-files.patch
use-system-mathjax-if-available.patch
-parallel-2to3.patch
shared-static-path.patch
no-submodule-check.patch
test-default-tk.patch
Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -5,7 +5,7 @@
--- a/IPython/html/__init__.py
+++ b/IPython/html/__init__.py
-@@ -2,6 +2,6 @@
+@@ -2,7 +2,7 @@
import os
# Packagers: modify this line if you store the notebook static files elsewhere
@@ -13,3 +13,4 @@
+DEFAULT_STATIC_FILES_PATH = "/usr/share/ipython/notebook/static"
del os
+
Modified: packages/ipython/trunk/debian/patches/test-default-tk.patch
===================================================================
--- packages/ipython/trunk/debian/patches/test-default-tk.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/test-default-tk.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -2,7 +2,7 @@
Forwarded: not-needed
--- a/IPython/core/tests/test_pylabtools.py
+++ b/IPython/core/tests/test_pylabtools.py
-@@ -95,24 +95,24 @@ class TestPylabSwitch(object):
+@@ -196,24 +196,24 @@ class TestPylabSwitch(object):
def test_qt(self):
s = self.Shell()
gui, backend = s.enable_matplotlib(None)
Modified: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -13,7 +13,7 @@
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
-@@ -126,7 +126,7 @@ def get_default_colors():
+@@ -128,7 +128,7 @@ def get_default_colors():
elif os.name=='nt':
return 'Linux'
else:
Modified: packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -3,8 +3,8 @@
Subject: use ipython icon in desktop files
---- a/examples/core/ipython-qtconsole.desktop
-+++ b/examples/core/ipython-qtconsole.desktop
+--- a/examples/IPython Kernel/ipython-qtconsole.desktop
++++ b/examples/IPython Kernel/ipython-qtconsole.desktop
@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python qtco
Exec=ipython qtconsole
GenericName[en_US]=Python shell
@@ -14,8 +14,8 @@
Name[en_US]=IPython Qt console
Name=IPython Qt console
Categories=Development;Utility;
---- a/examples/core/ipython.desktop
-+++ b/examples/core/ipython.desktop
+--- a/examples/IPython Kernel/ipython.desktop
++++ b/examples/IPython Kernel/ipython.desktop
@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python shel
Exec=ipython
GenericName[en_US]=IPython
Modified: packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch 2014-05-03 12:34:47 UTC (rev 28745)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch 2014-05-03 15:40:58 UTC (rev 28746)
@@ -2,49 +2,28 @@
Date: Sun, 18 Dec 2011 14:04:29 +0100
Subject: use system mathjax if available
----
- IPython/html/notebookapp.py | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
-
--- a/IPython/html/notebookapp.py
+++ b/IPython/html/notebookapp.py
-@@ -200,6 +200,11 @@ class NotebookWebApplication(web.Applica
- pattern = url_path_join(settings['base_project_url'], handler[0])
+@@ -218,6 +218,11 @@ class NotebookWebApplication(web.Applica
+ pattern = url_path_join(settings['base_url'], handler[0])
new_handler = tuple([pattern] + list(handler[1:]))
new_handlers.append(new_handler)
+
+ if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
+ new_handlers.append((r"/mathjax/(.*)", web.StaticFileHandler,
-+ {"path": "/usr/share/javascript/mathjax"}))
++ {"path": "/usr/share/javascript/mathjax"}))
+
+ # add 404 on the end, which will catch everything that falls through
+ new_handlers.append((r'(.*)', Template404))
return new_handlers
-
-
-@@ -443,15 +448,19 @@ class NotebookApp(BaseIPythonApplication
- try:
- mathjax = filefind(os.path.join('mathjax', 'MathJax.js'), self.static_file_path)
- except IOError:
-- if self.certfile:
-- # HTTPS: load from Rackspace CDN, because SSL certificate requires it
-- base = u"https://c328740.ssl.cf1.rackcdn.com"
-+ if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
-+ self.log.info("Using system MathJax")
-+ return u"/mathjax/MathJax.js"
- else:
-- base = u"http://cdn.mathjax.org"
--
-- url = base + u"/mathjax/latest/MathJax.js"
-- self.log.info("Using MathJax from CDN: %s", url)
-- return url
-+ if self.certfile:
-+ # HTTPS: load from Rackspace CDN, because SSL certificate requires it
-+ base = u"https://c328740.ssl.cf1.rackcdn.com"
-+ else:
-+ base = u"http://cdn.mathjax.org"
-+
-+ url = base + u"/mathjax/latest/MathJax.js"
-+ self.log.info("Using MathJax from CDN: %s", url)
-+ return url
- else:
- self.log.info("Using local MathJax from %s" % mathjax)
- return url_path_join(static_url_prefix, u"mathjax/MathJax.js")
+@@ -490,6 +495,10 @@ class NotebookApp(BaseIPythonApplication
+ url = url_path_join(url_prefix, u"mathjax/MathJax.js")
+ self.log.info("Serving local MathJax from %s at %s", mathjax, url)
+ return url
++
++ if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
++ self.log.info("Using system MathJax")
++ return u"/mathjax/MathJax.js"
+
+ # no local mathjax, serve from CDN
+ if self.certfile:
More information about the Python-modules-commits
mailing list