<!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>[128667] 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/128667">128667</a></dd>
<dt>Author</dt> <dd>petr@macports.org</dd>
<dt>Date</dt> <dd>2014-11-24 17:24:16 -0800 (Mon, 24 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>py-obspy{,-devel}: replace py26 subport with py27, update py-obspy-devel</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpygraveyardPortfile">trunk/dports/python/py-graveyard/Portfile</a></li>
<li><a href="#trunkdportspythonpyobspyPortfile">trunk/dports/python/py-obspy/Portfile</a></li>
<li><a href="#trunkdportspythonpyobspydevelPortfile">trunk/dports/python/py-obspy-devel/Portfile</a></li>
<li><a href="#trunkdportspythonpyobspydevelfilespatchsetuppydiff">trunk/dports/python/py-obspy-devel/files/patch-setup.py.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyobspydevelfilespatchsetupsudspydiff">trunk/dports/python/py-obspy-devel/files/patch-setup-suds.py.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpygraveyardPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-graveyard/Portfile (128666 => 128667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graveyard/Portfile        2014-11-25 01:15:33 UTC (rev 128666)
+++ trunk/dports/python/py-graveyard/Portfile        2014-11-25 01:24:16 UTC (rev 128667)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx"> oauth               1.0.1_1     25 26
</span><span class="cx"> oauth2              1.5.211_1   24 25 26
</span><span class="cx"> oauth2client        1.2_1       25 26
</span><ins>+obspy               0.9.2_1     26
+obspy-devel         0.9.2-1322  26
</ins><span class="cx"> ode                 1.2.1_1     25 26
</span><span class="cx"> openpyxl            2.1.2_1     25 26 33
</span><span class="cx"> osmgpsmap           0.7.3_5     26
</span></span></pre></div>
<a id="trunkdportspythonpyobspyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-obspy/Portfile (128666 => 128667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-obspy/Portfile        2014-11-25 01:15:33 UTC (rev 128666)
+++ trunk/dports/python/py-obspy/Portfile        2014-11-25 01:24:16 UTC (rev 128667)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">                     rmd160  701999f3bbd71eb5d116b6575b9599342f6b4c72 \
</span><span class="cx">                     sha256  9c5be30398fbe620ce467d676b04996468fa7d85160e3d65e8eb39d724435f92
</span><span class="cx"> 
</span><del>-python.versions     26 27
</del><ins>+python.versions     27
</ins><span class="cx"> 
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx">     depends_build-append    port:py${python.version}-numpy
</span></span></pre></div>
<a id="trunkdportspythonpyobspydevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-obspy-devel/Portfile (128666 => 128667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-obspy-devel/Portfile        2014-11-25 01:15:33 UTC (rev 128666)
+++ trunk/dports/python/py-obspy-devel/Portfile        2014-11-25 01:24:16 UTC (rev 128667)
</span><span class="lines">@@ -5,11 +5,10 @@
</span><span class="cx"> PortGroup           python 1.0
</span><span class="cx"> PortGroup           github 1.0
</span><span class="cx"> 
</span><del>-github.setup        obspy obspy 159dc12bee
</del><ins>+github.setup        obspy obspy 150c6b523b
</ins><span class="cx"> name                py-${github.project}-devel
</span><span class="cx"> conflicts           py-${github.project}
</span><del>-version             0.9.2-1295-g${github.version}
-
</del><ins>+version             0.9.2-1322-g${github.version}
</ins><span class="cx"> categories-append   science
</span><span class="cx"> platforms           darwin
</span><span class="cx"> license             LGPL-3
</span><span class="lines">@@ -30,11 +29,11 @@
</span><span class="cx"> 
</span><span class="cx"> homepage            http://www.obspy.org/
</span><span class="cx"> 
</span><del>-checksums           md5     2614bf7f77265f041b25c435745d9048 \
-                    rmd160  0bcbe2925666db9a14d090f3faa51cb09ea2c56a \
-                    sha256  663416b33c7f229514960445e7e4ece7d892d281f3b06d6c65be9f7cc0836319
</del><ins>+checksums           md5     8e6f9c02ea70108b0674e2467b15865b \
+                    rmd160  513adc73cb32579406daffb4d69c758f121f67df \
+                    sha256  fecf7f93d87851a388ce65cfb4e8a2d2e41b3f7765dd212a486eef927b57bc4d
</ins><span class="cx"> 
</span><del>-python.versions     26 27 33 34
</del><ins>+python.versions     27 33 34
</ins><span class="cx"> 
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx">     depends_build-append    port:py${python.version}-numpy
</span><span class="lines">@@ -47,15 +46,13 @@
</span><span class="cx">                             port:py${python.version}-matplotlib
</span><span class="cx"> 
</span><span class="cx">     # suds alternative dependency, Py2 only: suds or suds-jurko
</span><del>-    if { ${python.version} &lt; 30 } {
-        depends_lib-append \
-            path:${python.pkgd}/suds:py${python.version}-suds-jurko
</del><ins>+    #if { ${python.version} &lt; 30 } {
+    #    depends_lib-append \
+    #        path:${python.pkgd}/suds:py${python.version}-suds-jurko
+    #} else {
+    #    depends_lib-append  port:py${python.version}-suds-jurko
+    #}
</ins><span class="cx"> 
</span><del>-        patchfiles-append   patch-setup-suds.py.diff      
-    } else {
-        depends_lib-append  port:py${python.version}-suds-jurko
-    }
-
</del><span class="cx">     # Note: Required for post-installation testing only 
</span><span class="cx">     depends_run-append      port:py${python.version}-flake8 \
</span><span class="cx">                             port:py${python.version}-nose
</span></span></pre></div>
<a id="trunkdportspythonpyobspydevelfilespatchsetupsudspydiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-obspy-devel/files/patch-setup-suds.py.diff (128666 => 128667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-obspy-devel/files/patch-setup-suds.py.diff        2014-11-25 01:15:33 UTC (rev 128666)
+++ trunk/dports/python/py-obspy-devel/files/patch-setup-suds.py.diff        2014-11-25 01:24:16 UTC (rev 128667)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- setup.orig.py
-+++ setup.py
-@@ -92,8 +92,7 @@
-     'scipy',
-     'matplotlib',
-     'lxml',
--    'sqlalchemy',
--    'suds-jurko']
-+    'sqlalchemy' ]
- EXTRAS_REQUIRE = {
-     'tests': ['flake8&gt;=2',
-               'nose',
</del></span></pre></div>
<a id="trunkdportspythonpyobspydevelfilespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-obspy-devel/files/patch-setup.py.diff (128666 => 128667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-obspy-devel/files/patch-setup.py.diff        2014-11-25 01:15:33 UTC (rev 128666)
+++ trunk/dports/python/py-obspy-devel/files/patch-setup.py.diff        2014-11-25 01:24:16 UTC (rev 128667)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- setup.orig.py
</span><span class="cx"> +++ setup.py
</span><del>-@@ -455,7 +455,11 @@
</del><ins>+@@ -528,7 +528,11 @@
</ins><span class="cx">      libname = _get_lib_name(&quot;tau&quot;, add_extension_suffix=False)
</span><span class="cx">      files = glob.glob(os.path.join(path, &quot;*.f&quot;))
</span><span class="cx">      # compiler specific options
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">      # XXX: The build subdirectory is difficult to determine if installed
</span><span class="cx">      # via pypi or other means. I could not find a reliable way of doing it.
</span><span class="cx">      new_interface_path = os.path.join(&quot;build&quot;, libname + os.extsep + &quot;pyf&quot;)
</span><del>-@@ -473,6 +477,20 @@
</del><ins>+@@ -546,6 +550,20 @@
</ins><span class="cx">      # gfortran the option -lgcov is required
</span><span class="cx">      if os.environ.get('OBSPY_C_COVERAGE', &quot;&quot;):
</span><span class="cx">          kwargs['libraries'].append('gcov')
</span></span></pre>
</div>
</div>

</body>
</html>