Revision: 139771 https://trac.macports.org/changeset/139771 Author: eborisch@macports.org Date: 2015-08-26 09:37:44 -0700 (Wed, 26 Aug 2015) Log Message: ----------- py-spyder: update to 2.3.6; Use py-qtconsole. Closes #48685. Modified Paths: -------------- trunk/dports/python/py-spyder/Portfile trunk/dports/python/py-spyder/files/patch-widgets-pylintgui.py.diff trunk/dports/python/py-spyder/files/spyderlib_start_app.py.diff Modified: trunk/dports/python/py-spyder/Portfile =================================================================== --- trunk/dports/python/py-spyder/Portfile 2015-08-26 16:23:20 UTC (rev 139770) +++ trunk/dports/python/py-spyder/Portfile 2015-08-26 16:37:44 UTC (rev 139771) @@ -3,7 +3,7 @@ PortSystem 1.0 name py-spyder -version 2.3.4 +version 2.3.6 revision 0 # Preference on mailing list is to use small numbers for epoch. # This is already a date code, so sticking with dates. @@ -42,8 +42,8 @@ if {${name} ne ${subport}} { checksums \ - rmd160 dd274f122189fe5f2e4a7c7c34799bc13e6a88c6 \ - sha256 da4b13d6faed3e8810c0418f8274b26fde4f265ea4f93bee154af128a755c184 + rmd160 1b29680780e9407e0edf517468029f3da2abaca7 \ + sha256 0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2 conflicts py${python.version}-spyder-devel @@ -113,7 +113,8 @@ port:py${python.version}-pylint \ port:py${python.version}-pep8 \ port:py${python.version}-pyflakes \ - port:py${python.version}-rope + port:py${python.version}-rope \ + port:py${python.version}-psutil } # These add substantially to the install time @@ -121,7 +122,7 @@ ![ variant_isset tiny ] } { depends_lib-append \ path:${python.pkgd}/h5py/__init__.py:py${python.version}-h5py \ - port:py${python.version}-ipython \ + port:py${python.version}-qtconsole \ port:py${python.version}-matplotlib \ port:py${python.version}-scipy } Modified: trunk/dports/python/py-spyder/files/patch-widgets-pylintgui.py.diff =================================================================== --- trunk/dports/python/py-spyder/files/patch-widgets-pylintgui.py.diff 2015-08-26 16:23:20 UTC (rev 139770) +++ trunk/dports/python/py-spyder/files/patch-widgets-pylintgui.py.diff 2015-08-26 16:37:44 UTC (rev 139771) @@ -1,11 +1,19 @@ ---- spyderplugins/widgets/pylintgui.py.orig 2011-09-08 08:45:35.000000000 -0500 -+++ spyderplugins/widgets/pylintgui.py 2011-09-08 08:46:52.000000000 -0500 -@@ -40,7 +40,7 @@ - is_module_or_package) +--- spyderplugins/widgets/pylintgui.py.orig 2015-06-23 09:49:01.000000000 -0500 ++++ spyderplugins/widgets/pylintgui.py 2015-06-23 09:49:31.000000000 -0500 +@@ -40,14 +40,8 @@ _ = get_translation("p_pylint", dirname="spyderplugins") --PYLINT_PATH = programs.find_program('pylint') + +-PYLINT = 'pylint' +-if PY3: +- if programs.find_program('pylint3'): +- PYLINT = 'pylint3' +- elif programs.find_program('python3-pylint'): +- PYLINT = 'python3-pylint' +- +-PYLINT_PATH = programs.find_program(PYLINT) ++PYLINT = '@@LINT_BIN_NAME@@' +PYLINT_PATH = programs.find_program('@@LINT_BIN_NAME@@') - #TODO: display results on 3 columns instead of 1: msg_id, lineno, message + def get_pylint_version(): Modified: trunk/dports/python/py-spyder/files/spyderlib_start_app.py.diff =================================================================== --- trunk/dports/python/py-spyder/files/spyderlib_start_app.py.diff 2015-08-26 16:23:20 UTC (rev 139770) +++ trunk/dports/python/py-spyder/files/spyderlib_start_app.py.diff 2015-08-26 16:37:44 UTC (rev 139771) @@ -1,15 +1,8 @@ --- spyderlib/start_app.py-orig 2013-10-14 12:43:43.000000000 -0500 +++ spyderlib/start_app.py 2013-10-14 12:45:50.000000000 -0500 -@@ -1,12 +1,16 @@ - # -*- coding: utf-8 -*- - - import os.path as osp -+import os - import socket - import time +@@ -7,6 +7,9 @@ import atexit import random - import sys +if os.environ.get('LANG') == 'UTF-8': + os.environ['LANG'] = 'en_US.UTF-8'