[Python-modules-commits] r27083 - in packages/ipython/trunk/debian (21 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Mon Jan 6 20:19:25 UTC 2014
Date: Monday, January 6, 2014 @ 20:19:24
Author: jtaylor-guest
Revision: 27083
new upstream release
start of with daily 1.1.0 ppa build state
Added:
packages/ipython/trunk/debian/patches/no-submodule-check.patch
Modified:
packages/ipython/trunk/debian/changelog
packages/ipython/trunk/debian/control
packages/ipython/trunk/debian/ipython-doc.examples
packages/ipython/trunk/debian/ipython-notebook-common.install
packages/ipython/trunk/debian/ipython-notebook.install
packages/ipython/trunk/debian/ipython-qtconsole.install
packages/ipython/trunk/debian/ipython.install
packages/ipython/trunk/debian/ipython3-notebook.install
packages/ipython/trunk/debian/ipython3-qtconsole.install
packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
packages/ipython/trunk/debian/patches/debianize-error-messages.patch
packages/ipython/trunk/debian/patches/parallel-2to3.patch
packages/ipython/trunk/debian/patches/series
packages/ipython/trunk/debian/patches/shared-static-path.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
packages/ipython/trunk/debian/rules
Deleted:
packages/ipython/trunk/debian/ipython-notebook-common.links
packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch
Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/changelog 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1,8 +1,12 @@
-ipython (0.13.2-3) UNRELEASED; urgency=low
+ipython (1.1.0-1) unstable; urgency=low
+ [ Julian Taylor ]
+ * New upstream release
+
+ [ Jakub Wilk ]
* Fix a typo in README.source.
- -- Jakub Wilk <jwilk at debian.org> Wed, 12 Jun 2013 13:22:13 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Mon, 06 Jan 2014 16:45:14 +0100
ipython (0.13.2-2) unstable; urgency=low
Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/control 2014-01-06 20:19:24 UTC (rev 27083)
@@ -19,7 +19,7 @@
python-tk,
python-tornado,
python-wxgtk2.8,
- python-zmq (>= 2.1.4),
+ python-zmq (>= 2.1.11),
python3-all,
python3-setuptools,
xauth,
Modified: packages/ipython/trunk/debian/ipython-doc.examples
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.examples 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython-doc.examples 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/doc/ipython/examples/core
-debian/tmp/usr/share/doc/ipython/examples/lib
-debian/tmp/usr/share/doc/ipython/examples/parallel
-debian/tmp/usr/share/doc/ipython/examples/notebooks
+examples/core
+examples/lib
+examples/parallel
+examples/notebooks
Modified: packages/ipython/trunk/debian/ipython-notebook-common.install
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.install 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython-notebook-common.install 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1,2 +1 @@
-IPython/external/js usr/share/ipython/notebook
-IPython/frontend/html/notebook/static usr/share/ipython/notebook
+IPython/html/static usr/share/ipython/notebook
Deleted: packages/ipython/trunk/debian/ipython-notebook-common.links
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.links 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython-notebook-common.links 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1,12 +0,0 @@
-/usr/share/ipython/notebook/js/jquery-ui.js /usr/share/ipython/notebook/static/jquery/js/jquery-ui.min.js
-
-/usr/share/ipython/notebook/js/jquery-ui.css /usr/share/ipython/notebook/static/jquery/css/themes/base/jquery-ui.min.css
-
-/usr/share/ipython/notebook/js/prettify.js /usr/share/ipython/notebook/static/prettify/prettify.js
-
-/usr/share/javascript/jquery/jquery.js usr/share/ipython/notebook/static/jquery/js/jquery-1.7.1.min.js
-# disabled as unpackaged dev branch is needed for 0.13
-#/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/ipython/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
-
-#/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css usr/share/ipython/notebook/static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css
-# images handled by dh_linktree
Modified: packages/ipython/trunk/debian/ipython-notebook.install
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook.install 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython-notebook.install 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1 +1 @@
-/usr/lib/python2*/dist-packages/IPython/frontend/html
+/usr/lib/python2*/dist-packages/IPython/html
Modified: packages/ipython/trunk/debian/ipython-qtconsole.install
===================================================================
--- packages/ipython/trunk/debian/ipython-qtconsole.install 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython-qtconsole.install 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1,2 +1,2 @@
-/usr/lib/python2*/dist-packages/IPython/frontend/qt/
-docs/examples/core/ipython-qtconsole.desktop usr/share/applications/
+/usr/lib/python2*/dist-packages/IPython/qt/
+examples/core/ipython-qtconsole.desktop usr/share/applications/
Modified: packages/ipython/trunk/debian/ipython.install
===================================================================
--- packages/ipython/trunk/debian/ipython.install 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython.install 2014-01-06 20:19:24 UTC (rev 27083)
@@ -6,7 +6,6 @@
/usr/bin/irunner
/usr/bin/pycolor
/usr/lib/python2.*
-/usr/share/doc/ipython/examples/vim
/usr/share/doc/ipython/extensions
docs/emacs/ipython.el usr/share/emacs/site-lisp
-docs/examples/core/ipython.desktop usr/share/applications/
+examples/core/ipython.desktop usr/share/applications/
Modified: packages/ipython/trunk/debian/ipython3-notebook.install
===================================================================
--- packages/ipython/trunk/debian/ipython3-notebook.install 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython3-notebook.install 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1 +1 @@
-/usr/lib/python3/dist-packages/IPython/frontend/html
+/usr/lib/python3/dist-packages/IPython/html
Modified: packages/ipython/trunk/debian/ipython3-qtconsole.install
===================================================================
--- packages/ipython/trunk/debian/ipython3-qtconsole.install 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/ipython3-qtconsole.install 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1 +1 @@
-/usr/lib/python3*/dist-packages/IPython/frontend/qt/
+/usr/lib/python3*/dist-packages/IPython/qt/
Modified: packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -4,12 +4,8 @@
Fixes missing shebang in seteditor.py example script
----
- docs/examples/core/seteditor.py | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
---- a/docs/examples/core/seteditor.py
-+++ b/docs/examples/core/seteditor.py
+--- a/examples/core/seteditor.py
++++ b/examples/core/seteditor.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -2,23 +2,32 @@
Date: Thu, 7 Jul 2011 18:19:04 +0200
Subject: debianize error messages
---- a/IPython/zmq/__init__.py
-+++ b/IPython/zmq/__init__.py
-@@ -50,12 +50,12 @@ def check_for_zmq(minimum_version, modul
- try:
- import zmq
- except ImportError:
-- raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))
-+ raise ImportError("%s requires python-zmq >= %s"%(module, minimum_version))
+
+--- a/IPython/config/application.py
++++ b/IPython/config/application.py
+@@ -534,9 +534,19 @@ class Application(SingletonConfigurable)
+
+ If a global instance already exists, this reinitializes and starts it
+ """
+- app = cls.instance(**kwargs)
+- app.initialize(argv)
+- app.start()
++ try:
++ app = cls.instance(**kwargs)
++ app.initialize(argv)
++ app.start()
++ except ImportError as e:
++ 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
++ elif "IPython.html" in str(e) or "html.notebookapp" in str(e):
++ print "Could not start notebook. Please install %s-notebook" % ipy
++ else:
++ raise
- pyzmq_version = zmq.__version__
-
- 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 V(zmq.zmq_version()) >= V('4.0.0'):
+ #-----------------------------------------------------------------------------
+ # utility functions, for convenience
--- a/IPython/lib/clipboard.py
+++ b/IPython/lib/clipboard.py
@@ -43,8 +43,9 @@ def tkinter_clipboard_get():
@@ -32,29 +41,21 @@
root = Tkinter.Tk()
root.withdraw()
text = root.clipboard_get()
---- a/IPython/frontend/terminal/ipapp.py
-+++ b/IPython/frontend/terminal/ipapp.py
-@@ -384,10 +384,19 @@ def load_default_config(ipython_dir=None
+--- a/IPython/utils/zmqrelated.py
++++ b/IPython/utils/zmqrelated.py
+@@ -34,13 +34,13 @@ def check_for_zmq(minimum_version, requi
+ try:
+ import zmq
+ except ImportError:
+- raise ImportError("%s requires pyzmq >= %s"%(required_by, minimum_version))
++ raise ImportError("%s requires python-zmq >= %s"%(required_by, minimum_version))
+
+ patch_pyzmq()
+
+ pyzmq_version = zmq.__version__
+
+ if not check_version(pyzmq_version, minimum_version):
+- raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
++ raise ImportError("%s requires python-zmq >= %s, but you have %s"%(
+ required_by, minimum_version, pyzmq_version))
- def launch_new_instance():
- """Create and run a full blown IPython instance"""
-- app = TerminalIPythonApp.instance()
-- app.initialize()
-- app.start()
--
-+ try:
-+ app = TerminalIPythonApp.instance()
-+ app.initialize()
-+ app.start()
-+ except ImportError as e:
-+ from IPython.utils import py3compat
-+ ipy = "ipython3" if py3compat.PY3 else "ipython"
-+ if "IPython.frontend.qt" in str(e) or "qt.console.qtconsoleapp" in str(e):
-+ print "Could not start qtconsole. Please install %s-qtconsole" % ipy
-+ elif "IPython.frontend.html" in str(e) or "html.notebook.notebookapp" in str(e):
-+ print "Could not start notebook. Please install %s-notebook" % ipy
-+ else:
-+ raise
-
- if __name__ == '__main__':
- launch_new_instance()
Added: packages/ipython/trunk/debian/patches/no-submodule-check.patch
===================================================================
--- packages/ipython/trunk/debian/patches/no-submodule-check.patch (rev 0)
+++ packages/ipython/trunk/debian/patches/no-submodule-check.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -0,0 +1,19 @@
+--- a/IPython/html/notebookapp.py
++++ b/IPython/html/notebookapp.py
+@@ -652,15 +652,7 @@ class NotebookApp(BaseIPythonApplication
+ print self.notebook_info()
+
+ def init_components(self):
+- """Check the components submodule, and warn if it's unclean"""
+- status = submodule.check_submodule_status()
+- if status == 'missing':
+- self.log.warn("components submodule missing, running `git submodule update`")
+- submodule.update_submodules(submodule.ipython_parent())
+- 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
+ def initialize(self, argv=None):
Modified: packages/ipython/trunk/debian/patches/parallel-2to3.patch
===================================================================
--- packages/ipython/trunk/debian/patches/parallel-2to3.patch 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/parallel-2to3.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -4,9 +4,9 @@
--- a/setup.py
+++ b/setup.py
-@@ -262,6 +262,17 @@ if 'setuptools' in sys.modules:
+@@ -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():
@@ -20,5 +20,5 @@
+ doctests_only=doctests_only)
+ lib2to3.refactor.RefactoringTool = RefactoringTool
setuptools_extra_args['use_2to3'] = True
- from setuptools.command.build_py import build_py
- setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}
+ # 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-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/series 2014-01-06 20:19:24 UTC (rev 27083)
@@ -5,4 +5,4 @@
use-system-mathjax-if-available.patch
parallel-2to3.patch
shared-static-path.patch
-sphinx1.2-compat.patch
+no-submodule-check.patch
Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -3,23 +3,13 @@
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Forwarded: not-needed
---- a/IPython/frontend/html/notebook/notebookapp.py
-+++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -157,7 +157,7 @@ class NotebookWebApplication(web.Applica
-
- settings = dict(
- template_path=os.path.join(os.path.dirname(__file__), "templates"),
-- static_path=os.path.join(os.path.dirname(__file__), "static"),
-+ static_path=os.path.join("/usr/share/ipython/notebook/static"),
- cookie_secret=os.urandom(1024),
- login_url="%s/login"%(base_project_url.rstrip('/')),
- )
-@@ -366,7 +366,7 @@ class NotebookApp(BaseIPythonApplication
- def _mathjax_url_default(self):
- if not self.enable_mathjax:
- return u''
-- static_path = self.webapp_settings.get("static_path", os.path.join(os.path.dirname(__file__), "static"))
-+ static_path = self.webapp_settings.get("static_path", "/usr/share/ipython/notebook/static")
- static_url_prefix = self.webapp_settings.get("static_url_prefix",
- "/static/")
- if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
+--- a/IPython/html/__init__.py
++++ b/IPython/html/__init__.py
+@@ -2,6 +2,6 @@
+
+ import os
+ # Packagers: modify this line if you store the notebook static files elsewhere
+-DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static")
++DEFAULT_STATIC_FILES_PATH = "/usr/share/ipython/notebook/static"
+
+ del os
Deleted: packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch
===================================================================
--- packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/sphinx1.2-compat.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -1,28 +0,0 @@
-Description: Fix inheritance_diagram Sphinx extension for Sphinx 1.2
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706531
-Origin: f657f2b2a6e723c8633e55155fa54f9c3a3050f5
-Author: Thomas Kluyver <takowl at gmail.com>
-
---- a/docs/sphinxext/inheritance_diagram.py
-+++ b/docs/sphinxext/inheritance_diagram.py
-@@ -40,7 +40,9 @@ except ImportError:
-
- from docutils.nodes import Body, Element
- from docutils.parsers.rst import directives
--from sphinx.roles import xfileref_role
-+from sphinx.roles import XRefRole
-+
-+xfileref_role = XRefRole()
-
- def my_import(name):
- """Module importer - taken from the python documentation.
---- a/docs/source/development/doc_guide.txt
-+++ b/docs/source/development/doc_guide.txt
-@@ -160,6 +160,7 @@ they're automatically exposed as a websi
-
- .. [reStructuredText] reStructuredText. http://docutils.sourceforge.net/rst.html
- .. [Sphinx] Sphinx. http://sphinx.pocoo.org/
-+.. [Matplotlib] http://matplotlib.org/
- .. [MatplotlibDocGuide] http://matplotlib.sourceforge.net/devel/documenting_mpl.html
- .. [PEP257] PEP 257. http://www.python.org/peps/pep-0257.html
- .. [NumPyDocGuide] NumPy documentation guide. https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
Modified: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -8,12 +8,12 @@
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/241535
---
- IPython/core/interactiveshell.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ IPython/core/interactiveshell.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
-@@ -123,7 +123,7 @@ def get_default_colors():
+@@ -125,7 +125,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-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -2,14 +2,9 @@
Date: Wed, 9 Nov 2011 18:07:12 +0100
Subject: use ipython icon in desktop files
----
- docs/examples/core/ipython-qtconsole.desktop | 2 +-
- docs/examples/core/ipython-sh.desktop | 2 +-
- docs/examples/core/ipython.desktop | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
---- a/docs/examples/core/ipython-qtconsole.desktop
-+++ b/docs/examples/core/ipython-qtconsole.desktop
+--- a/examples/core/ipython-qtconsole.desktop
++++ b/examples/core/ipython-qtconsole.desktop
@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python qtco
Exec=ipython qtconsole
GenericName[en_US]=Python shell
@@ -19,19 +14,8 @@
Name[en_US]=IPython Qt console
Name=IPython Qt console
Categories=Development;Utility;
---- a/docs/examples/core/ipython-sh.desktop
-+++ b/docs/examples/core/ipython-sh.desktop
-@@ -6,7 +6,7 @@ Comment=Perform shell-like tasks in inte
- Exec=ipython --profile=pysh
- GenericName[en_US]=IPython shell mode
- GenericName=IPython shell mode
--Icon=gnome-netstatus-idle
-+Icon=ipython
- Name[en_US]=ipython-sh
- Name=ipython-sh
- Categories=Development;Utility;
---- a/docs/examples/core/ipython.desktop
-+++ b/docs/examples/core/ipython.desktop
+--- a/examples/core/ipython.desktop
++++ b/examples/core/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-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch 2014-01-06 20:19:24 UTC (rev 27083)
@@ -3,29 +3,48 @@
Subject: use system mathjax if available
---
- IPython/frontend/html/notebook/notebookapp.py | 10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
+ IPython/html/notebookapp.py | 25 +++++++++++++++++--------
+ 1 file changed, 17 insertions(+), 8 deletions(-)
---- a/IPython/frontend/html/notebook/notebookapp.py
-+++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -150,6 +150,10 @@ class NotebookWebApplication(web.Applica
- # Note that the URLs these patterns check against are escaped,
- # and thus guaranteed to be ASCII: 'héllo' is really 'h%C3%A9llo'.
- base_project_url = py3compat.unicode_to_str(base_project_url, 'ascii')
+--- 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])
+ new_handler = tuple([pattern] + list(handler[1:]))
+ new_handlers.append(new_handler)
+
+ if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
-+ handlers.append((r"/mathjax/(.*)", web.StaticFileHandler,
-+ {"path": "/usr/share/javascript/mathjax"}))
-
- settings = dict(
- template_path=os.path.join(os.path.dirname(__file__), "templates"),
-@@ -368,6 +372,9 @@ class NotebookApp(BaseIPythonApplication
- if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
- self.log.info("Using local MathJax")
- return static_url_prefix+u"mathjax/MathJax.js"
-+ elif os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
-+ self.log.info("Using system MathJax")
-+ return u"/mathjax/MathJax.js"
++ new_handlers.append((r"/mathjax/(.*)", web.StaticFileHandler,
++ {"path": "/usr/share/javascript/mathjax"}))
++
+ 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:
- if self.certfile:
- # HTTPS: load from Rackspace CDN, because SSL certificate requires it
+ self.log.info("Using local MathJax from %s" % mathjax)
+ return url_path_join(static_url_prefix, u"mathjax/MathJax.js")
Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules 2014-01-06 16:08:42 UTC (rev 27082)
+++ packages/ipython/trunk/debian/rules 2014-01-06 20:19:24 UTC (rev 27083)
@@ -55,30 +55,27 @@
override_dh_install:
dh_install -pipython \
- --exclude="IPython/frontend/qt/" \
- --exclude="IPython/frontend/html/" \
- --exclude="IPython/deathrow/" \
+ --exclude="IPython/qt/" \
+ --exclude="IPython/html/" \
--exclude="IPython/quarantine/" \
- --exclude="IPython/external/js/" \
--exclude=tests
- dh_install -pipython-notebook --exclude="html/notebook/static/" --exclude=tests
+ dh_install -pipython-notebook --exclude="html/static/" --exclude=tests
dh_install -pipython-notebook-common -XCOPYING -XLICENSE -XLICENSE.txt
dh_install -pipython-qtconsole --exclude=tests
dh_install -pipython3 \
- --exclude="IPython/frontend/qt/" \
- --exclude="IPython/frontend/html/" \
- --exclude="IPython/deathrow/" \
+ --exclude="IPython/qt/" \
+ --exclude="IPython/html/" \
--exclude="IPython/quarantine/" \
--exclude=tests
- dh_install -pipython3-notebook --exclude="html/notebook/static/" --exclude=tests
+ dh_install -pipython3-notebook --exclude="html/static/" --exclude=tests
dh_install -pipython3-qtconsole --exclude=tests
mkdir -p debian/ipython3/usr/share/applications/
sed -e "s/ipython/ipython3/" -e "s/IPython/IPython3/" \
- docs/examples/core/ipython.desktop > debian/ipython3/usr/share/applications/ipython3.desktop
+ examples/core/ipython.desktop > debian/ipython3/usr/share/applications/ipython3.desktop
mkdir -p debian/ipython3-qtconsole/usr/share/applications/
sed -e "s/ipython/ipython3/" -e "s/IPython/IPython3/" \
- docs/examples/core/ipython-qtconsole.desktop > debian/ipython3-qtconsole/usr/share/applications/ipython3-qtconsole.desktop
+ examples/core/ipython-qtconsole.desktop > debian/ipython3-qtconsole/usr/share/applications/ipython3-qtconsole.desktop
# jquery-ui-themes provides more in javascript/jquery-ui-themes (not available in 12.04)
# disabled as long as the ui dev branch is used
@@ -86,10 +83,10 @@
# usr/share/ipython/notebook/static/jquery/css/themes
mkdir -p $(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/
- cp IPython/frontend/qt/console/resources/icon/IPythonConsole.svg \
+ cp IPython/qt/console/resources/icon/IPythonConsole.svg \
$(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/ipython.svg
mkdir -p $(CURDIR)/debian/ipython3/usr/share/icons/hicolor/scalable/apps/
- cp IPython/frontend/qt/console/resources/icon/IPythonConsole.svg \
+ cp IPython/qt/console/resources/icon/IPythonConsole.svg \
$(CURDIR)/debian/ipython3/usr/share/icons/hicolor/scalable/apps/ipython3.svg
# remove embedded arparse
@@ -121,9 +118,11 @@
done
# change permission on scripts
- chmod a-x $(CURDIR)/debian/ipython/usr/share/doc/ipython/examples/*
- find $(CURDIR)/debian/ipython-notebook-common/usr/share/ipython/notebook/static/codemirror/ \
- -type f | xargs chmod a-x
+ find $(CURDIR)/debian/ipython-notebook-common -type f | xargs chmod a-x
+
+ rm -rf $(CURDIR)/debian/ipython-notebook-common/usr/share/ipython/notebook/static/components/codemirror/bin/
+ rm -rf $(CURDIR)/debian/ipython-notebook-common/usr/share/ipython/notebook/static/components/marked/bin/
+ rm -rf $(CURDIR)/debian/ipython-notebook-common/usr/share/ipython/notebook/static/components/less.js/bin/
override_dh_installdocs:
ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
@@ -136,25 +135,6 @@
dh_installdocs -pipython-notebook-common
dh_installdocs -pipython-doc
find $(CURDIR)/debian/ipython -type d -empty -delete
-
- # remove all the duplicates to keep -doc small
- set -e && \
- for f in hist_simple.png hist_with_text.png ipy_013_dashboard_cluster.png ipy_013_dashboard.png \
- ipy_013_notebook_cythonmagic.png ipy_013_notebook_long_out.png ipy_013_notebook_octavemagic.png \
- ipy_013_notebook_rmagic.png ipy_013_notebook_script_cells.png ipy_013_notebook_spectrogram.png \
- ipy_013_notebook_tooltip.png ipy_013_par_tb.png ipy_013_qtconsole_completer.png plot_simple.png \
- plot_simple_python.png ms_visual_studio.png notebook_specgram.png \
- qtconsole.png qtconsole_tabbed.png; \
- do \
- rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython-doc/html/_images/$$f; \
- dh_link -pipython-doc usr/share/doc/ipython-doc/html/_static/$$f usr/share/doc/ipython-doc/html/_images/$$f; \
- done
- rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython-doc/html/_static/plot_simple.png
- dh_link -pipython-doc usr/share/doc/ipython-doc/html/_static/plot_simple_python.png \
- usr/share/doc/ipython-doc/html/_static/plot_simple.png
- rm -f $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython-doc/html/_images/qtconsole1.png
- dh_link -pipython-doc usr/share/doc/ipython-doc/html/_static/qtconsole.png \
- usr/share/doc/ipython-doc/html/_images/qtconsole1.png
endif
# work around #683108
More information about the Python-modules-commits
mailing list