<!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>[122256] 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/122256">122256</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2014-07-18 15:31:05 -0700 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-spyder[-devel]: Update to 2.3.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspyderPortfile">trunk/dports/python/py-spyder/Portfile</a></li>
<li><a href="#trunkdportspythonpyspyderdevelPortfile">trunk/dports/python/py-spyder-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspyderfilesno_AAdiff">trunk/dports/python/py-spyder/files/no_AA.diff</a></li>
<li><a href="#trunkdportspythonpyspyderfilessetuppydiff">trunk/dports/python/py-spyder/files/setup.py.diff</a></li>
<li><a href="#trunkdportspythonpyspyderdevelfilessetuppydiff">trunk/dports/python/py-spyder-devel/files/setup.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 (122255 => 122256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder/Portfile 2014-07-18 22:25:39 UTC (rev 122255)
+++ trunk/dports/python/py-spyder/Portfile 2014-07-18 22:31:05 UTC (rev 122256)
</span><span class="lines">@@ -3,13 +3,15 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> name py-spyder
</span><del>-version 2.2.5
-revision 2
</del><ins>+version 2.3.0
+revision 0
+# Preference on mailing list is to use small numbers for epoch.
+# This is already a date code, so sticking with dates.
</ins><span class="cx"> epoch 20111202
</span><span class="cx">
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><del>-python.versions 26 27
</del><ins>+python.versions 26 27 33 34
</ins><span class="cx">
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx"> categories-append devel
</span><span class="lines">@@ -40,10 +42,10 @@
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> checksums \
</span><del>- rmd160 6422c9c18a81f5bc67c6e5f21f32e744ab6c1179 \
- sha256 e2ae6155d6f84a9bdee7b3a6eca4b72f3f5e6d775ad23e8d0e82e125342eacaf
</del><ins>+ rmd160 5d69b1565690f3546a6022b16b4febc5257aac2c \
+ sha256 4a64159eda895c4e1fde92a05ebfcc76f98d9d8d39317d2ffe68ed596635e8f6
</ins><span class="cx">
</span><del>- conflicts py${python.version}-spyder-devel
</del><ins>+ conflicts py${python.version}-spyder
</ins><span class="cx">
</span><span class="cx"> # Set the pylint executable name
</span><span class="cx"> set LINT_BIN_NAME pylint-${python.branch}
</span><span class="lines">@@ -51,9 +53,10 @@
</span><span class="cx"> patchfiles patch-widgets-pylintgui.py.diff \
</span><span class="cx"> spyderlib_baseconfig.py.diff \
</span><span class="cx"> spyderlib_plugins_editor.py.diff \
</span><ins>+ spyderlib_start_app.py.diff \
</ins><span class="cx"> spyderlib_spyder.py.diff \
</span><del>- spyderlib_start_app.py.diff \
- spyderlib_utils_programs.py.diff
</del><ins>+ spyderlib_utils_programs.py.diff \
+ setup.py.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span class="lines">@@ -70,6 +73,8 @@
</span><span class="cx"> ${worksrcpath}/spyderlib/spyder.py
</span><span class="cx"> reinplace "s|@@APPS_DIR@@|${applications_dir}|g" \
</span><span class="cx"> ${worksrcpath}/spyderlib/utils/programs.py
</span><ins>+ reinplace "s|Ctrl\+I|Cmd+I|" \
+ ${worksrcpath}/spyderlib/plugins/inspector.py
</ins><span class="cx"> # Windows newlines in the file cause compile() (in 2.6) to choke
</span><span class="cx"> reinplace "s|\r||g" \
</span><span class="cx"> ${worksrcpath}/doc/conf.py
</span><span class="lines">@@ -78,23 +83,27 @@
</span><span class="cx"> # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span class="cx"> # Bare minimum
</span><span class="cx"> depends_lib-append \
</span><del>- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
-
</del><ins>+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
+ port:py${python.version}-sphinx \
+ port:py${python.version}-zmq
+
</ins><span class="cx"> variant tiny description {
</span><span class="cx"> Remove all optional dependencies for quickest install. Dependencies\
</span><del>- are detected/enabled at runtime and may be installed separately.\
- Using these variants only affects MacPorts' dependency tracking (which\
- will, in turn, force installation if needed.)
</del><ins>+ are detected/enabled at runtime and may be installed separately.
</ins><span class="cx"> } conflicts small {}
</span><span class="cx">
</span><span class="cx"> variant small description {
</span><span class="cx"> Remove most optional dependencies for quicker install. Dependencies\
</span><del>- are detected/enabled at runtime and may be installed separately.\
- Using these variants only affects MacPorts' dependency tracking (which\
- will, in turn, force installations if needed.)
-
</del><ins>+ are detected/enabled at runtime and may be installed separately.
</ins><span class="cx"> } conflicts tiny {}
</span><span class="cx">
</span><ins>+ variant no_anti_alias description {Use non-anti-aliased fonts in editor.} {
+ patchfiles-append no_AA.diff
+ }
+
+ variant optimized description {Create .pyo files. Fails on BuildBot.} {
+ }
+
</ins><span class="cx"> # These add very little to the install time
</span><span class="cx"> if {![ variant_isset tiny ]} {
</span><span class="cx"> depends_lib-append \
</span><span class="lines">@@ -102,9 +111,7 @@
</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 \
- port:py${python.version}-sphinx \
- port:py${python.version}-sympy
</del><ins>+ port:py${python.version}-rope
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # These add substantially to the install time
</span><span class="lines">@@ -113,7 +120,6 @@
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> path:${python.pkgd}/h5py/__init__.py:py${python.version}-h5py \
</span><span class="cx"> port:py${python.version}-ipython \
</span><del>- port:py${python.version}-zmq \
</del><span class="cx"> port:py${python.version}-matplotlib \
</span><span class="cx"> port:py${python.version}-scipy
</span><span class="cx"> }
</span><span class="lines">@@ -135,14 +141,16 @@
</span><span class="cx"> if {${python.version} == ${python.default_version}} {
</span><span class="cx"> ln -s ${python.prefix}/bin/spyder ${destroot}${prefix}/bin/
</span><span class="cx"> }
</span><del>-
- set OPTCMD [concat "HOME=${destroot}/tmp/spyder " \
- "PYTHONPATH=${destroot}${python.pkgd} " \
- "./spyder --optimize"]
</del><span class="cx">
</span><del>- file mkdir ${destroot}/tmp/spyder
- system "cd ${destroot}${python.prefix}/bin && ${OPTCMD}"
- delete ${destroot}/tmp/spyder
</del><ins>+ if {[variant_isset optimized]} {
+ set OPTCMD [concat "HOME=${destroot}/tmp/spyder " \
+ "PYTHONPATH=${destroot}${python.pkgd} " \
+ "./spyder --optimize"]
+
+ file mkdir ${destroot}/tmp/spyder
+ system "cd ${destroot}${python.prefix}/bin && ${OPTCMD}"
+ delete ${destroot}/tmp/spyder
+ }
</ins><span class="cx"> delete \
</span><span class="cx"> ${destroot}${prefix}/bin/spyder_win_post_install.py-${python.branch}
</span><span class="cx"> delete ${destroot}${python.prefix}/bin/spyder_win_post_install.py
</span></span></pre></div>
<a id="trunkdportspythonpyspyderfilesno_AAdifffromrev122245trunkdportspythonpyspyderdevelfilesno_AAdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/python/py-spyder/files/no_AA.diff (from rev 122245, trunk/dports/python/py-spyder-devel/files/no_AA.diff) (0 => 122256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder/files/no_AA.diff (rev 0)
+++ trunk/dports/python/py-spyder/files/no_AA.diff 2014-07-18 22:31:05 UTC (rev 122256)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- spyderlib/widgets/sourcecode/syntaxhighlighters.py.orig 2014-05-01 12:42:23.000000000 -0500
++++ spyderlib/widgets/sourcecode/syntaxhighlighters.py 2014-05-01 12:43:40.000000000 -0500
+@@ -265,6 +265,10 @@
+ if bold:
+ format.setFontWeight(QFont.Bold)
+ format.setFontItalic(italic)
++ if not italic and not bold:
++ font = format.font()
++ font.setStyleStrategy(QFont.NoAntialias)
++ format.setFont(font)
+ self.formats[name] = format
+
+ def _check_color_scheme(self, color_scheme):
</ins></span></pre></div>
<a id="trunkdportspythonpyspyderfilessetuppydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-spyder/files/setup.py.diff (0 => 122256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder/files/setup.py.diff (rev 0)
+++ trunk/dports/python/py-spyder/files/setup.py.diff 2014-07-18 22:31:05 UTC (rev 122256)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- setup.py.orig 2014-06-05 09:44:07.000000000 -0500
++++ setup.py 2014-06-05 09:44:25.000000000 -0500
+@@ -181,7 +181,7 @@
+ if TARGET_MATCH:
+ TARGET_VERSION = TARGET_MATCH.groups()
+ else:
+- TARGET_VERSION = (str(sys.version_info.major), str(sys.version_info.minor))
++ TARGET_VERSION = (str(sys.version_info[0]), str(sys.version_info[1]))
+
+
+ def get_packages():
+
</ins></span></pre></div>
<a id="trunkdportspythonpyspyderdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spyder-devel/Portfile (122255 => 122256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/Portfile 2014-07-18 22:25:39 UTC (rev 122255)
+++ trunk/dports/python/py-spyder-devel/Portfile 2014-07-18 22:31:05 UTC (rev 122256)
</span><span class="lines">@@ -3,15 +3,15 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> name py-spyder-devel
</span><del>-version 2.3.0rc
-revision 1
</del><ins>+version 2.3.0
+revision 0
</ins><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><del>-epoch 20130508
</del><ins>+epoch 20140711
</ins><span class="cx">
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><del>-python.versions 26 27 32 33
</del><ins>+python.versions 26 27 33 34
</ins><span class="cx">
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx"> categories-append devel
</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 51664bcf0293977d5b516929ecb11639adebe4d9 \
- sha256 7e9b067254026af455a577d594734c97cf5e7fe9898544a09dd4c36756c28cb6
</del><ins>+ rmd160 5d69b1565690f3546a6022b16b4febc5257aac2c \
+ sha256 4a64159eda895c4e1fde92a05ebfcc76f98d9d8d39317d2ffe68ed596635e8f6
</ins><span class="cx">
</span><span class="cx"> conflicts py${python.version}-spyder
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,8 @@
</span><span class="cx"> spyderlib_plugins_editor.py.diff \
</span><span class="cx"> spyderlib_start_app.py.diff \
</span><span class="cx"> spyderlib_spyder.py.diff \
</span><del>- spyderlib_utils_programs.py.diff
</del><ins>+ spyderlib_utils_programs.py.diff \
+ setup.py.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span class="lines">@@ -109,11 +110,8 @@
</span><span class="cx"> port:py${python.version}-htmldocs \
</span><span class="cx"> port:py${python.version}-pylint \
</span><span class="cx"> port:py${python.version}-pep8 \
</span><del>- port:py${python.version}-pyflakes
- if { ${python.version} < 30 } {
- depends_lib-append \
- port:py${python.version}-rope
- }
</del><ins>+ port:py${python.version}-pyflakes \
+ port:py${python.version}-rope
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # These add substantially to the install time
</span><span class="lines">@@ -126,13 +124,11 @@
</span><span class="cx"> port:py${python.version}-scipy
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if { ${python.version} < 30 } {
- variant pil description {
</del><ins>+ variant pil description {
</ins><span class="cx"> Support image objects in editor through PIL or Pillow (many dependencies.)
</span><del>- } {
- depends_lib-append \
- path:${python.pkgd}/PIL:py${python.version}-Pillow
- }
</del><ins>+ } {
+ depends_lib-append \
+ path:${python.pkgd}/PIL:py${python.version}-Pillow
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-extract {
</span></span></pre></div>
<a id="trunkdportspythonpyspyderdevelfilessetuppydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-spyder-devel/files/setup.py.diff (0 => 122256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spyder-devel/files/setup.py.diff (rev 0)
+++ trunk/dports/python/py-spyder-devel/files/setup.py.diff 2014-07-18 22:31:05 UTC (rev 122256)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- setup.py.orig 2014-06-05 09:44:07.000000000 -0500
++++ setup.py 2014-06-05 09:44:25.000000000 -0500
+@@ -181,7 +181,7 @@
+ if TARGET_MATCH:
+ TARGET_VERSION = TARGET_MATCH.groups()
+ else:
+- TARGET_VERSION = (str(sys.version_info.major), str(sys.version_info.minor))
++ TARGET_VERSION = (str(sys.version_info[0]), str(sys.version_info[1]))
+
+
+ def get_packages():
+
</ins></span></pre>
</div>
</div>
</body>
</html>