<!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>[149533] 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/149533">149533</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2016-06-24 15:18:36 -0700 (Fri, 24 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-qtpy: Update to latest
py-qtawesome: Update to latest
py-spyder-devel: Update to latest. Qt5 only now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyqtawesomePortfile">trunk/dports/python/py-qtawesome/Portfile</a></li>
<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_spyderpydiff">trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff</a></li>
<li><a href="#trunkdportspythonpyspyderdevelfilesspyderlib_start_apppydiff">trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyqtawesomePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qtawesome/Portfile (149532 => 149533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qtawesome/Portfile 2016-06-24 20:05:01 UTC (rev 149532)
+++ trunk/dports/python/py-qtawesome/Portfile 2016-06-24 22:18:36 UTC (rev 149533)
</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 qtawesome 0.2.0 v
</del><ins>+github.setup spyder-ide qtawesome 0.3.3 v
</ins><span class="cx"> name py-qtawesome
</span><span class="cx">
</span><span class="cx"> license MIT
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> Elusive Icons in PyQt and PySide applications.
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 36299eddacf07cd64654f57976c5a61505e56d03 \
- sha256 1af52e9594e7a3bf81f72c5425f25f2beb1ed9aaa88441a09870efbfb3cfe2ac
</del><ins>+ rmd160 c919e39f866431c93862b82871892b797ecb0632 \
+ sha256 e8b31ec91d0b1a5917dec46e15b22d33a4db55e6451fb24be389cf42440fe4e7
</ins><span class="cx">
</span><span class="cx"> python.versions 27 34 35
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpyqtpyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qtpy/Portfile (149532 => 149533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qtpy/Portfile 2016-06-24 20:05:01 UTC (rev 149532)
+++ trunk/dports/python/py-qtpy/Portfile 2016-06-24 22:18:36 UTC (rev 149533)
</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.0b1
</del><ins>+github.setup spyder-ide qtpy 1.0.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 4ee64916d40a1ed81c948f64c1e818f4cae90f50 \
- sha256 c96f7e991787a2af1030af5c14b2e1f06017da06ae7d93335ec2f3791026a567
</del><ins>+ rmd160 070cd2e7a10a959384718b92208457baa4274529 \
+ sha256 88939058068b253b678af047f2a7a9d97492658745f947541dd14a39196a9c03
</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 (149532 => 149533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/Portfile 2016-06-24 20:05:01 UTC (rev 149532)
+++ trunk/dports/python/py-spyder-devel/Portfile 2016-06-24 22:18:36 UTC (rev 149533)
</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.0b2 v
</del><ins>+github.setup spyder-ide spyder 3.0.0b3 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,19 +40,14 @@
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> checksums \
</span><del>- rmd160 e35eed3debe141c610346a5fb2fd0a2e49c2361d \
- sha256 60353e331547f2a1c4bec31df487525e3cac04a4f942f86dc650a32a6d000afa
</del><ins>+ rmd160 41a58f5e089e2500f444db5767b51697016a7a60 \
+ sha256 8baf16080ef286208b3380bd438d33dad5dd345318b5669f58feff65ca82b388
</ins><span class="cx">
</span><span class="cx"> conflicts py${python.version}-spyder
</span><span class="cx">
</span><span class="cx"> # Will *work* with either/both under the hood, but for dependencies,
</span><span class="cx"> # provide variants to determine what we label depends_lib.
</span><span class="cx">
</span><del>- variant qt5 description {Default to Qt5 GUI.} {
- depends_lib-delete port:py${python.version}-pyqt4
- depends_lib-append port:py${python.version}-pyqt5
- }
-
</del><span class="cx"> # Set the pylint executable name
</span><span class="cx"> set LINT_BIN_NAME pylint-${python.branch}
</span><span class="cx"> set WINPDB_BIN_NAME winpdb-${python.branch}
</span><span class="lines">@@ -69,27 +64,19 @@
</span><span class="cx"> reinplace "s|@@LINT_BIN_NAME@@|${LINT_BIN_NAME}|g" \
</span><span class="cx"> ${worksrcpath}/spyplugins/ui/pylint/widgets/pylintgui.py
</span><span class="cx"> reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><del>- ${worksrcpath}/spyderlib/spyder.py
</del><ins>+ ${worksrcpath}/spyderlib/app/spyder.py
</ins><span class="cx"> reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><del>- ${worksrcpath}/spyderlib/spyder.py
</del><ins>+ ${worksrcpath}/spyderlib/app/spyder.py
</ins><span class="cx"> reinplace "s|\"designer\"|\"Designer\"|g" \
</span><del>- ${worksrcpath}/spyderlib/spyder.py
</del><ins>+ ${worksrcpath}/spyderlib/app/spyder.py
</ins><span class="cx"> reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><del>- ${worksrcpath}/spyderlib/spyder.py
- reinplace "s|Ctrl\+I|Cmd+I|" \
- ${worksrcpath}/spyderlib/plugins/inspector.py
</del><ins>+ ${worksrcpath}/spyderlib/app/spyder.py
</ins><span class="cx"> reinplace -E "s|IPython\.qt(\.console)?|qtconsole|g" \
</span><span class="cx"> ${worksrcpath}/spyderlib/config/ipython.py \
</span><span class="cx"> ${worksrcpath}/spyderlib/plugins/ipythonconsole.py \
</span><span class="cx"> ${worksrcpath}/spyderlib/widgets/ipython.py
</span><del>- if {[variant_isset qt5]} {
- reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
- ${worksrcpath}/spyderlib/utils/programs.py
- reinplace -E "/setdefault/s/pyqt/pyqt5/" spyderlib/qt/__init__.py
- } else {
- reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt4|g" \
- ${worksrcpath}/spyderlib/utils/programs.py
- }
</del><ins>+ reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
+ ${worksrcpath}/spyderlib/utils/programs.py
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Bare minimum
</span><span class="lines">@@ -100,7 +87,7 @@
</span><span class="cx"> port:py${python.version}-qtawesome \
</span><span class="cx"> port:py${python.version}-pickleshare \
</span><span class="cx"> port:py${python.version}-path \
</span><del>- port:py${python.version}-pyqt4
</del><ins>+ port:py${python.version}-pyqt5
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:GraphicsMagick
</span><span class="lines">@@ -145,9 +132,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant docs description {Include python and Qt offline documentation.} {
</span><del>- if {[variant_isset qt5]} {
- depends_lib-append port:qt5-docs
- }
</del><ins>+ depends_lib-append port:qt5-docs
</ins><span class="cx"> depends_lib-append port:py${python.version}-htmldocs
</span><span class="cx"> }
</span><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 (149532 => 149533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff 2016-06-24 20:05:01 UTC (rev 149532)
+++ trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff 2016-06-24 22:18:36 UTC (rev 149533)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>---- spyplugins/ui/pylint/widgets/pylintgui.py.orig 2015-06-23 09:49:01.000000000 -0500
-+++ spyplugins/ui/pylint/widgets/pylintgui.py 2015-06-23 09:49:31.000000000 -0500
-@@ -40,14 +40,8 @@
- _ = get_translation("p_pylint", dirname="spyderplugins")
</del><ins>+--- 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
+@@ -47,16 +47,9 @@
+ _ = gettext.gettext
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> -PYLINT = 'pylint'
</span><span class="lines">@@ -11,8 +11,11 @@
</span><span class="cx"> - elif programs.find_program('python3-pylint'):
</span><span class="cx"> - PYLINT = 'python3-pylint'
</span><span class="cx"> -
</span><ins>+-
+-locale_codec = QTextCodec.codecForLocale()
</ins><span class="cx"> -PYLINT_PATH = programs.find_program(PYLINT)
</span><span class="cx"> +PYLINT = '@@LINT_BIN_NAME@@'
</span><ins>++locale_codec = QTextCodec.codecForLocale()
</ins><span class="cx"> +PYLINT_PATH = programs.find_program('@@LINT_BIN_NAME@@')
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelfilesspyderlib_spyderpydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff (149532 => 149533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff 2016-06-24 20:05:01 UTC (rev 149532)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff 2016-06-24 22:18:36 UTC (rev 149533)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- spyderlib/spyder.py.orig 2011-09-05 18:29:00.000000000 -0500
-+++ spyderlib/spyder.py 2011-09-08 08:36:55.000000000 -0500
</del><ins>+--- spyderlib/app/spyder.py.orig 2011-09-05 18:29:00.000000000 -0500
++++ spyderlib/app/spyder.py 2011-09-08 08:36:55.000000000 -0500
</ins><span class="cx"> @@ -142,7 +142,7 @@
</span><span class="cx"> return osp.join(doc_path, python_chm[0])
</span><span class="cx"> else:
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelfilesspyderlib_start_apppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff (149532 => 149533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff 2016-06-24 20:05:01 UTC (rev 149532)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff 2016-06-24 22:18:36 UTC (rev 149533)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- 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
</del><ins>+--- spyderlib/app/start.py-orig 2013-10-14 12:43:43.000000000 -0500
++++ spyderlib/app/start.py 2013-10-14 12:45:50.000000000 -0500
</ins><span class="cx"> @@ -7,6 +7,9 @@
</span><span class="cx"> import atexit
</span><span class="cx"> import random
</span></span></pre>
</div>
</div>
</body>
</html>