[Python-modules-commits] r22379 - in packages/ipython/trunk/debian (10 files)

jtaylor-guest at users.alioth.debian.org jtaylor-guest at users.alioth.debian.org
Sat Jun 30 13:23:58 UTC 2012 

    Date: Saturday, June 30, 2012 @ 13:23:54
  Author: jtaylor-guest
Revision: 22379

refresh patches, drop upstream applied full-qt-imports

Modified:
  packages/ipython/trunk/debian/changelog
  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
Deleted:
  packages/ipython/trunk/debian/patches/full-qt-imports.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/changelog	2012-06-30 13:23:54 UTC (rev 22379)
@@ -3,9 +3,10 @@
   * New upstream release
     No repackging necessary anymore, js sources available in external
     minified variants are not installed
+  * refresh patches, drop upstream applied full-qt-imports 
   * drop libjs-jquery-ui dependency, use the embedded development branch
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 10:57:58 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 11:03:21 +0200
 
 ipython (0.12.1+dfsg-2) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/05_fix_seteditor_example.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -8,8 +8,6 @@
  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 @@
@@ -18,4 +16,3 @@
  import os
  
  
--- 

Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -26,7 +26,7 @@
 +    raise
 --- a/IPython/zmq/__init__.py
 +++ b/IPython/zmq/__init__.py
-@@ -16,12 +16,12 @@
+@@ -50,12 +50,12 @@
      try:
          import zmq
      except ImportError:
@@ -40,4 +40,4 @@
 +        raise ImportError("%s requires python-zmq >= %s, but you have %s"%(
                          module, minimum_version, pyzmq_version))
  
-     # fix missing DEALER/ROUTER aliases in pyzmq < 2.1.9
+     if V(zmq.zmq_version()) >= V('4.0.0'):

Deleted: packages/ipython/trunk/debian/patches/full-qt-imports.patch
===================================================================
--- packages/ipython/trunk/debian/patches/full-qt-imports.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/full-qt-imports.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -1,22 +0,0 @@
-Description: try importing needed qt modules before choosing a framework
- avoids choosing an incomplete qt version if a full one is available
-Applied-Upstream: 0.13
-Forwarded: https://github.com/ipython/ipython/pull/1704
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671363
---- a/IPython/external/qt.py
-+++ b/IPython/external/qt.py
-@@ -28,12 +28,13 @@
-         if PySide.__version__ < '1.0.3':
-             # old PySide, fallback on PyQt
-             raise ImportError
-+        from PySide import QtCore, QtGui, QtSvg
-         QT_API = QT_API_PYSIDE
-     except ImportError:
-         try:
-             prepare_pyqt4()
-             import PyQt4
--            from PyQt4 import QtCore
-+            from PyQt4 import QtCore, QtGui, QtSvg
-             if QtCore.PYQT_VERSION_STR < '4.7':
-                 # PyQt 4.6 has issues with null strings returning as None
-                 raise ImportError

Modified: packages/ipython/trunk/debian/patches/parallel-2to3.patch
===================================================================
--- packages/ipython/trunk/debian/patches/parallel-2to3.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/parallel-2to3.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -2,23 +2,23 @@
 Author: Jakub Wilk
 Forwarded: takowl at gmail.com
 
---- a/setup3.py
-+++ b/setup3.py
-@@ -20,6 +20,17 @@
- setup_args.update(bdist_wininst_options())
- 
- def main():
-+    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
-     setup(use_2to3 = True, **setup_args)
+--- a/setup.py
++++ b/setup.py
+@@ -233,6 +233,17 @@
+                                   "ipython_win_post_install.py"}}
      
- if __name__ == "__main__":
+     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
+         from setuptools.command.build_py import build_py
+         setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/series	2012-06-30 13:23:54 UTC (rev 22379)
@@ -5,4 +5,3 @@
 use-system-mathjax-if-available.patch
 parallel-2to3.patch
 shared-static-path.patch
-full-qt-imports.patch

Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -5,7 +5,7 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -112,7 +112,7 @@
+@@ -147,7 +147,7 @@
  
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
@@ -14,12 +14,12 @@
              cookie_secret=os.urandom(1024),
              login_url="/login",
          )
-@@ -285,7 +285,7 @@
+@@ -366,7 +366,7 @@
      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")):
-             self.log.info("Using local MathJax")
-             return u"static/mathjax/MathJax.js"

Modified: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -13,7 +13,7 @@
 
 --- a/IPython/core/interactiveshell.py
 +++ b/IPython/core/interactiveshell.py
-@@ -125,7 +125,7 @@
+@@ -145,7 +145,7 @@
      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	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/use-ipython-icon-in-desktop-files.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -8,11 +8,9 @@
  docs/examples/core/ipython.desktop           |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/docs/examples/core/ipython-qtconsole.desktop b/docs/examples/core/ipython-qtconsole.desktop
-index 9d72cc0..daedf95 100644
 --- a/docs/examples/core/ipython-qtconsole.desktop
 +++ b/docs/examples/core/ipython-qtconsole.desktop
-@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python qtconsole
+@@ -6,7 +6,7 @@
  Exec=ipython qtconsole
  GenericName[en_US]=Python shell
  GenericName=Python shell
@@ -21,11 +19,9 @@
  Name[en_US]=IPython Qt console
  Name=IPython Qt console
  Categories=Development;Utility;
-diff --git a/docs/examples/core/ipython-sh.desktop b/docs/examples/core/ipython-sh.desktop
-index e47a3eb..d8268d7 100644
 --- a/docs/examples/core/ipython-sh.desktop
 +++ b/docs/examples/core/ipython-sh.desktop
-@@ -6,7 +6,7 @@ Comment=Perform shell-like tasks in interactive ipython session
+@@ -6,7 +6,7 @@
  Exec=ipython --profile=pysh
  GenericName[en_US]=IPython shell mode
  GenericName=IPython shell mode
@@ -34,11 +30,9 @@
  Name[en_US]=ipython-sh
  Name=ipython-sh
  Categories=Development;Utility;
-diff --git a/docs/examples/core/ipython.desktop b/docs/examples/core/ipython.desktop
-index 4d9d310..86a7fc8 100644
 --- a/docs/examples/core/ipython.desktop
 +++ b/docs/examples/core/ipython.desktop
-@@ -6,7 +6,7 @@ Comment=Enhanced interactive Python shell
+@@ -6,7 +6,7 @@
  Exec=ipython
  GenericName[en_US]=IPython
  GenericName=IPython
@@ -47,4 +41,3 @@
  Name[en_US]=ipython
  Name=ipython
  Categories=Development;Utility;
--- 

Modified: packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2012-06-30 13:23:46 UTC (rev 22378)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2012-06-30 13:23:54 UTC (rev 22379)
@@ -8,9 +8,9 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -105,6 +105,11 @@
-             (r"/notebooks/%s" % _notebook_id_regex, NotebookHandler),
-             (r"/rstservice/render", RSTHandler)
+@@ -140,6 +140,11 @@
+             (r"/clusters/%s/%s" % (_profile_regex, _cluster_action_regex), ClusterActionHandler),
+             (r"/clusters/%s" % _profile_regex, ClusterProfileHandler),
          ]
 +
 +        if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
@@ -20,13 +20,13 @@
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
              static_path=os.path.join(os.path.dirname(__file__), "static"),
-@@ -284,6 +289,9 @@
+@@ -367,6 +372,9 @@
          if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
              self.log.info("Using local MathJax")
-             return u"static/mathjax/MathJax.js"
+             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"
++            return u"/mathjax/MathJax.js"
          else:
-             self.log.info("Using MathJax from CDN")
-             return u"http://cdn.mathjax.org/mathjax/latest/MathJax.js"
+             if self.certfile:
+                 # HTTPS: load from Rackspace CDN, because SSL certificate requires it

More information about the Python-modules-commits mailing list