[93767] trunk/dports/python/py-spyder

[eborisch at macports.org]

Revision: 93767
          https://trac.macports.org/changeset/93767
Author:   eborisch at macports.org
Date:     2012-05-30 10:40:19 -0700 (Wed, 30 May 2012)
Log Message:
-----------
py-spyder: Upgrade to 2.1.10; Move user preferences dir from ~/.spyder2 to ~/.spyder2-NN to make -26 and -27 flavors coexist nicely.

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

Added Paths:
-----------
    trunk/dports/python/py-spyder/files/spyderlib_baseconfig.py.diff
    trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff

Modified: trunk/dports/python/py-spyder/Portfile
===================================================================
--- trunk/dports/python/py-spyder/Portfile	2012-05-30 17:37:51 UTC (rev 93766)
+++ trunk/dports/python/py-spyder/Portfile	2012-05-30 17:40:19 UTC (rev 93767)
@@ -3,7 +3,7 @@
 
 PortSystem          1.0
 name                py-spyder
-version             2.1.9
+version             2.1.10
 epoch               20111202
 
 PortGroup           python 1.0
@@ -38,9 +38,9 @@
 #pyNN-scipy doesn't build universal
 universal_variant   no 
 
-checksums           md5     051a4540ccca49976beec93c2d1f3d32 \
-                    sha1    7624a37d8e9266243113dc42e58455d8535fddb0 \
-                    rmd160  d9850ecb6b63d17dd50856006f3c29c5582f36e7
+checksums \
+    rmd160  ba8afe0223b41f5560d69b40be36fa8428b03ff8 \
+    sha256  4ba120eaae5f5fafe41787c69fb79888e5cda2f9ece73218bb190b30ffb259e1
 
 if {${subport} != ${name}} {
     conflicts           port:py${python.version}-spyder-beta
@@ -49,7 +49,9 @@
     set LINT_BIN_NAME   pylint-${python.branch}
     set WINPDB_BIN_NAME winpdb-${python.branch}
     patchfiles          patch-widgets-pylintgui.py.diff \
+                        spyderlib_baseconfig.py.diff \
                         spyderlib_plugins_editor.py.diff \
+                        spyderlib_plugins_externalconsole.py.diff \
                         spyderlib_spyder.py.diff \
                         spyderlib_utils_programs.py.diff \
                         spyderlib_widgets_sourcecode_codeeditor.py.diff
@@ -100,6 +102,12 @@
         system "cd ${destroot}${python.prefix}/bin && ${OPTCMD}"
         file delete -force ${destroot}/tmp/spyder
     }
+
+    notes \
+"If you have previously installed ${subport}, be advised that the user's\
+preferences directory has moved from ~/.spyder2 to ~/.spyder2-${python.version}\
+to enable multiple pyNN-spyder installations to work independently. Please have\
+users rename or copy the existing directory to retain preferences if desired."
 }
 
 livecheck.type      regex

Added: trunk/dports/python/py-spyder/files/spyderlib_baseconfig.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_baseconfig.py.diff	                        (rev 0)
+++ trunk/dports/python/py-spyder/files/spyderlib_baseconfig.py.diff	2012-05-30 17:40:19 UTC (rev 93767)
@@ -0,0 +1,13 @@
+--- spyderlib/baseconfig.py.orig	2012-05-30 08:53:43.000000000 -0500
++++ spyderlib/baseconfig.py	2012-05-30 08:55:30.000000000 -0500
+@@ -32,7 +32,9 @@
+ #==============================================================================
+ # Configuration paths
+ #==============================================================================
+-SUBFOLDER = '.spyder%s' % __version__.split('.')[0]
++SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
++                                sys.version_info[0],
++                                sys.version_info[1])
+ 
+ def get_conf_path(filename=None):
+     """Return absolute path for configuration file with specified filename"""

Added: trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff	                        (rev 0)
+++ trunk/dports/python/py-spyder/files/spyderlib_plugins_externalconsole.py.diff	2012-05-30 17:40:19 UTC (rev 93767)
@@ -0,0 +1,11 @@
+--- spyderlib/plugins/externalconsole.py.orig	2012-05-29 16:43:10.000000000 -0500
++++ spyderlib/plugins/externalconsole.py	2012-05-29 16:43:31.000000000 -0500
+@@ -339,7 +339,7 @@
+         ipython_group = QGroupBox(
+                             _("IPython interpreter command line options"))
+         ipython_layout = QVBoxLayout()
+-        ipython_is_installed = programs.is_module_installed('IPython', '0.1')
++        ipython_is_installed = programs.is_module_installed('IPython', '>=0.1')
+         if ipython_is_installed:
+             if programs.is_module_installed('IPython', '0.12'):
+                 ipython_edit_012 = self.create_lineedit("IPython >=v0.12",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120530/78d2a24f/attachment.html>