[103752] trunk/dports/python/py-ipython

[eborisch at macports.org]

Revision: 103752
          https://trac.macports.org/changeset/103752
Author:   eborisch at macports.org
Date:     2013-03-06 07:13:45 -0800 (Wed, 06 Mar 2013)
Log Message:
-----------
py-ipython: Fix version comparison tests now that PyQt4 is 4.10. See #38303.

Modified Paths:
--------------
    trunk/dports/python/py-ipython/Portfile

Added Paths:
-----------
    trunk/dports/python/py-ipython/files/IPython_external_qt.py.diff

Modified: trunk/dports/python/py-ipython/Portfile
===================================================================
--- trunk/dports/python/py-ipython/Portfile	2013-03-06 14:47:48 UTC (rev 103751)
+++ trunk/dports/python/py-ipython/Portfile	2013-03-06 15:13:45 UTC (rev 103752)
@@ -9,7 +9,7 @@
 
 name                py-${realname}
 version             0.13.1
-revision            0
+revision            1
 license             BSD
 platforms           darwin
 supported_archs     noarch
@@ -30,6 +30,9 @@
 checksums           rmd160  9e798d6853064da4a10a807aac0980f14b35ab32 \
                     sha256  3bbf1095c4fd1fbf0a0871d9e26571a1ce3c4113d83ee3b688fa58e7e917f8c0
 
+# Upstream addresses in current git version; remove patch when updated.
+patchfiles          IPython_external_qt.py.diff
+
 python.versions     24 25 26 27 31 32 33
 
 subport py24-${realname} {

Added: trunk/dports/python/py-ipython/files/IPython_external_qt.py.diff
===================================================================
--- trunk/dports/python/py-ipython/files/IPython_external_qt.py.diff	                        (rev 0)
+++ trunk/dports/python/py-ipython/files/IPython_external_qt.py.diff	2013-03-06 15:13:45 UTC (rev 103752)
@@ -0,0 +1,47 @@
+--- IPython/external/qt.py.orig	2012-10-20 19:30:53.000000000 -0500
++++ IPython/external/qt.py	2013-03-05 15:56:01.000000000 -0600
+@@ -7,6 +7,8 @@
+ """
+ 
+ import os
++import distutils.version as DV
++VER_LT = lambda a, b: DV.LooseVersion(a) < DV.LooseVersion(b)
+ 
+ # Available APIs.
+ QT_API_PYQT = 'pyqt'
+@@ -25,7 +27,7 @@
+ if QT_API is None:
+     try:
+         import PySide
+-        if PySide.__version__ < '1.0.3':
++        if VER_LT(PySide.__version__, '1.0.3'):
+             # old PySide, fallback on PyQt
+             raise ImportError
+         from PySide import QtCore, QtGui, QtSvg
+@@ -35,7 +37,7 @@
+             prepare_pyqt4()
+             import PyQt4
+             from PyQt4 import QtCore, QtGui, QtSvg
+-            if QtCore.PYQT_VERSION_STR < '4.7':
++            if VER_LT(QtCore.PYQT_VERSION_STR, '4.7'):
+                 # PyQt 4.6 has issues with null strings returning as None
+                 raise ImportError
+             QT_API = QT_API_PYQT
+@@ -49,7 +51,7 @@
+ # Now peform the imports.
+ if QT_API == QT_API_PYQT:
+     from PyQt4 import QtCore, QtGui, QtSvg
+-    if QtCore.PYQT_VERSION_STR < '4.7':
++    if VER_LT(QtCore.PYQT_VERSION_STR, '4.7'):
+         raise ImportError("IPython requires PyQt4 >= 4.7, found %s"%QtCore.PYQT_VERSION_STR)
+ 
+     # Alias PyQt-specific functions for PySide compatibility.
+@@ -58,7 +60,7 @@
+ 
+ elif QT_API == QT_API_PYSIDE:
+     import PySide
+-    if PySide.__version__ < '1.0.3':
++    if VER_LT(PySide.__version__, '1.0.3'):
+         raise ImportError("IPython requires PySide >= 1.0.3, found %s"%PySide.__version__)
+     from PySide import QtCore, QtGui, QtSvg
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130306/434ebdf8/attachment.html>