<!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>[151995] trunk/dports/python</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/151995">151995</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2016-08-25 20:00:00 -0700 (Thu, 25 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-spyder-devel, py-qtpy: Update to latest.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyqtpyPortfile">trunk/dports/python/py-qtpy/Portfile</a></li>
<li><a href="#trunkdportspythonpyspyderdevelPortfile">trunk/dports/python/py-spyder-devel/Portfile</a></li>
<li><a href="#trunkdportspythonpyspyderdevelfilespatchwidgetspylintguipydiff">trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff</a></li>
<li><a href="#trunkdportspythonpyspyderdevelfilesspyderlib_baseconfigpydiff">trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyqtpyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qtpy/Portfile (151994 => 151995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qtpy/Portfile 2016-08-26 02:13:35 UTC (rev 151994)
+++ trunk/dports/python/py-qtpy/Portfile 2016-08-26 03:00:00 UTC (rev 151995)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup spyder-ide qtpy 1.0.2 v
</del><ins>+github.setup spyder-ide qtpy 1.1.2 v
</ins><span class="cx"> name py-qtpy
</span><span class="cx">
</span><span class="cx"> categories-append devel
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> QtGui and QtWidgets).
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 070cd2e7a10a959384718b92208457baa4274529 \
- sha256 88939058068b253b678af047f2a7a9d97492658745f947541dd14a39196a9c03
</del><ins>+ rmd160 e41a77df5fb80bb18017486b9329b3daae0a2e0d \
+ sha256 86f95bd2a72f6ba6d377706664a7f5d7b0c7e21edf1b45c6055884e7f96f769a
</ins><span class="cx">
</span><span class="cx"> python.versions 27 34 35
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/Portfile (151994 => 151995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/Portfile 2016-08-26 02:13:35 UTC (rev 151994)
+++ trunk/dports/python/py-spyder-devel/Portfile 2016-08-26 03:00:00 UTC (rev 151995)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup spyder-ide spyder 3.0.0b3 v
</del><ins>+github.setup spyder-ide spyder 3.0.0b5 v
</ins><span class="cx"> name py-spyder-devel
</span><span class="cx"> revision 0
</span><span class="cx"> # Preference on mailing list is to use small numbers for epoch.
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> checksums \
</span><del>- rmd160 41a58f5e089e2500f444db5767b51697016a7a60 \
- sha256 8baf16080ef286208b3380bd438d33dad5dd345318b5669f58feff65ca82b388
</del><ins>+ rmd160 a8380bbc85eab1e7e29c352b8ec4b54236200514 \
+ sha256 c5269b6e3ec473c64d044d5a6154dacc8db286d652f52ad0846d1260858217fe
</ins><span class="cx">
</span><span class="cx"> conflicts py${python.version}-spyder
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span class="cx"> ${worksrcpath}/spyderlib/plugins/editor.py
</span><span class="cx"> reinplace "s|@@LINT_BIN_NAME@@|${LINT_BIN_NAME}|g" \
</span><del>- ${worksrcpath}/spyplugins/ui/pylint/widgets/pylintgui.py
</del><ins>+ ${worksrcpath}/spyder_pylint/widgets/pylintgui.py
</ins><span class="cx"> reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><span class="cx"> ${worksrcpath}/spyderlib/app/spyder.py
</span><span class="cx"> reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><span class="lines">@@ -113,9 +113,8 @@
</span><span class="cx"> path:${python.pkgd}/pep8:py${python.version}-pep8 \
</span><span class="cx"> port:py${python.version}-pyflakes \
</span><span class="cx"> port:py${python.version}-rope \
</span><del>- port:py${python.version}-psutil
- # Until spyder supports jedi >= 0.9.0, this doesn't do anything
- # port:py${python.version}-jedi
</del><ins>+ port:py${python.version}-psutil \
+ port:py${python.version}-jedi
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # These add substantially to the install time
</span><span class="lines">@@ -178,8 +177,4 @@
</span><span class="cx"> ### Spyder is launched from the terminal with ${EXENAME} ###
</span><span class="cx"> ##############################################################"
</span><span class="cx"> livecheck.type none
</span><del>-} else {
- livecheck.type regex
- livecheck.url https://bitbucket.org/spyder-ide/spyderlib/downloads
- livecheck.regex spyder-(\[0-9\]+(\.\[0-9betarc]+)*)\.zip
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelfilespatchwidgetspylintguipydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff (151994 => 151995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff 2016-08-26 02:13:35 UTC (rev 151994)
+++ trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff 2016-08-26 03:00:00 UTC (rev 151995)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- spyplugins/ui/pylint/widgets/pylintgui.py.orig 2016-06-07 13:57:54.000000000 -0500
-+++ spyplugins/ui/pylint/widgets/pylintgui.py 2016-06-07 13:59:10.000000000 -0500
</del><ins>+--- spyder_pylint/widgets/pylintgui.py.orig 2016-06-07 13:57:54.000000000 -0500
++++ spyder_pylint/widgets/pylintgui.py 2016-06-07 13:59:10.000000000 -0500
</ins><span class="cx"> @@ -47,16 +47,9 @@
</span><span class="cx"> _ = gettext.gettext
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelfilesspyderlib_baseconfigpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff (151994 => 151995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff 2016-08-26 02:13:35 UTC (rev 151994)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff 2016-08-26 03:00:00 UTC (rev 151995)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- spyderlib/config/base.py.orig 2015-06-23 10:06:48.000000000 -0500
-+++ spyderlib/config/base.py 2015-06-23 10:08:03.000000000 -0500
-@@ -21,6 +21,7 @@
</del><ins>+--- spyderlib/config/base.py.orig 2016-08-23 09:15:39.000000000 -0500
++++ spyderlib/config/base.py 2016-08-23 09:18:27.000000000 -0500
+@@ -22,6 +22,7 @@
</ins><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx"> # Local imports
</span><span class="lines">@@ -8,14 +8,35 @@
</span><span class="cx"> from spyderlib.utils import encoding
</span><span class="cx"> from spyderlib.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
</span><span class="cx"> to_text_string, is_text_string)
</span><del>-@@ -72,7 +73,9 @@
</del><ins>+@@ -73,10 +74,10 @@
+ # since 3.0+ we've reverted back to use .spyder to simplify major
</ins><span class="cx"> # updates in version (required when we change APIs by Linux
</span><span class="cx"> # packagers)
</span><del>- if TEST is None:
</del><ins>+-if sys.platform.startswith('linux'):
+- SUBFOLDER = 'spyder'
+-else:
</ins><span class="cx"> - SUBFOLDER = '.spyder'
</span><del>-+ SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
-+ sys.version_info[0],
-+ sys.version_info[1])
- else:
- SUBFOLDER = 'spyder_test'
</del><ins>++#if sys.platform.startswith('linux'):
++# SUBFOLDER = 'spyder'
++#else:
++# SUBFOLDER = '.spyder'
</ins><span class="cx">
</span><ins>+
+ # We can't have PY2 and PY3 settings in the same dir because:
+@@ -84,9 +85,14 @@
+ # embed a PY2 interpreter in PY3)
+ # 2. We need to save the list of installed modules (for code
+ # completion) separately for each version
+-if PY3:
+- SUBFOLDER = SUBFOLDER + '-py3'
++#if PY3:
++# SUBFOLDER = SUBFOLDER + '-py3'
+
++# Macports: We allow multiple python 2.x or 3.x versions side-by-side; keep
++# preferences separate.
++SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
++ sys.version_info[0],
++ sys.version_info[1])
+
+ def get_home_dir():
+ """
</ins></span></pre>
</div>
</div>
</body>
</html>