<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[139771] trunk/dports/python/py-spyder</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/139771">139771</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2015-08-26 09:37:44 -0700 (Wed, 26 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-spyder: update to 2.3.6; Use py-qtconsole. Closes #48685.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspyderPortfile">trunk/dports/python/py-spyder/Portfile</a></li>
<li><a href="#trunkdportspythonpyspyderfilespatchwidgetspylintguipydiff">trunk/dports/python/py-spyder/files/patch-widgets-pylintgui.py.diff</a></li>
<li><a href="#trunkdportspythonpyspyderfilesspyderlib_start_apppydiff">trunk/dports/python/py-spyder/files/spyderlib_start_app.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyspyderPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder/Portfile (139770 => 139771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> name py-spyder
</span><del>-version 2.3.4
</del><ins>+version 2.3.6
</ins><span class="cx"> revision 0
</span><span class="cx"> # Preference on mailing list is to use small numbers for epoch.
</span><span class="cx"> # This is already a date code, so sticking with dates.
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> checksums \
</span><del>- rmd160 dd274f122189fe5f2e4a7c7c34799bc13e6a88c6 \
- sha256 da4b13d6faed3e8810c0418f8274b26fde4f265ea4f93bee154af128a755c184
</del><ins>+ rmd160 1b29680780e9407e0edf517468029f3da2abaca7 \
+ sha256 0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2
</ins><span class="cx">
</span><span class="cx"> conflicts py${python.version}-spyder-devel
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,8 @@
</span><span class="cx"> port:py${python.version}-pylint \
</span><span class="cx"> port:py${python.version}-pep8 \
</span><span class="cx"> port:py${python.version}-pyflakes \
</span><del>- port:py${python.version}-rope
</del><ins>+ port:py${python.version}-rope \
+ port:py${python.version}-psutil
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # These add substantially to the install time
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx"> ![ variant_isset tiny ] } {
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> path:${python.pkgd}/h5py/__init__.py:py${python.version}-h5py \
</span><del>- port:py${python.version}-ipython \
</del><ins>+ port:py${python.version}-qtconsole \
</ins><span class="cx"> port:py${python.version}-matplotlib \
</span><span class="cx"> port:py${python.version}-scipy
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpyspyderfilespatchwidgetspylintguipydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder/files/patch-widgets-pylintgui.py.diff (139770 => 139771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +1,19 @@
</span><del>---- 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)
</del><ins>+--- 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 @@
</ins><span class="cx"> _ = get_translation("p_pylint", dirname="spyderplugins")
</span><span class="cx">
</span><del>--PYLINT_PATH = programs.find_program('pylint')
</del><ins>+
+-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@@'
</ins><span class="cx"> +PYLINT_PATH = programs.find_program('@@LINT_BIN_NAME@@')
</span><span class="cx">
</span><span class="cx">
</span><del>- #TODO: display results on 3 columns instead of 1: msg_id, lineno, message
</del><ins>+ def get_pylint_version():
</ins></span></pre></div>
<a id="trunkdportspythonpyspyderfilesspyderlib_start_apppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder/files/spyderlib_start_app.py.diff (139770 => 139771)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,15 +1,8 @@
</span><span class="cx"> --- spyderlib/start_app.py-orig 2013-10-14 12:43:43.000000000 -0500
</span><span class="cx"> +++ spyderlib/start_app.py 2013-10-14 12:45:50.000000000 -0500
</span><del>-@@ -1,12 +1,16 @@
- # -*- coding: utf-8 -*-
-
- import os.path as osp
-+import os
- import socket
- import time
</del><ins>+@@ -7,6 +7,9 @@
</ins><span class="cx"> import atexit
</span><span class="cx"> import random
</span><del>- import sys
</del><span class="cx">
</span><span class="cx"> +if os.environ.get('LANG') == 'UTF-8':
</span><span class="cx"> + os.environ['LANG'] = 'en_US.UTF-8'
</span></span></pre>
</div>
</div>
</body>
</html>