[128667] trunk/dports/python

[petr at macports.org]

Revision: 128667
          https://trac.macports.org/changeset/128667
Author:   petr at macports.org
Date:     2014-11-24 17:24:16 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
py-obspy{,-devel}: replace py26 subport with py27, update py-obspy-devel

Modified Paths:
--------------
    trunk/dports/python/py-graveyard/Portfile
    trunk/dports/python/py-obspy/Portfile
    trunk/dports/python/py-obspy-devel/Portfile
    trunk/dports/python/py-obspy-devel/files/patch-setup.py.diff

Removed Paths:
-------------
    trunk/dports/python/py-obspy-devel/files/patch-setup-suds.py.diff

Modified: trunk/dports/python/py-graveyard/Portfile
===================================================================
--- 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)
@@ -156,6 +156,8 @@
 oauth               1.0.1_1     25 26
 oauth2              1.5.211_1   24 25 26
 oauth2client        1.2_1       25 26
+obspy               0.9.2_1     26
+obspy-devel         0.9.2-1322  26
 ode                 1.2.1_1     25 26
 openpyxl            2.1.2_1     25 26 33
 osmgpsmap           0.7.3_5     26

Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- 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)
@@ -36,7 +36,7 @@
                     rmd160  701999f3bbd71eb5d116b6575b9599342f6b4c72 \
                     sha256  9c5be30398fbe620ce467d676b04996468fa7d85160e3d65e8eb39d724435f92
 
-python.versions     26 27
+python.versions     27
 
 if {${name} ne ${subport}} {
     depends_build-append    port:py${python.version}-numpy

Modified: trunk/dports/python/py-obspy-devel/Portfile
===================================================================
--- 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)
@@ -5,11 +5,10 @@
 PortGroup           python 1.0
 PortGroup           github 1.0
 
-github.setup        obspy obspy 159dc12bee
+github.setup        obspy obspy 150c6b523b
 name                py-${github.project}-devel
 conflicts           py-${github.project}
-version             0.9.2-1295-g${github.version}
-
+version             0.9.2-1322-g${github.version}
 categories-append   science
 platforms           darwin
 license             LGPL-3
@@ -30,11 +29,11 @@
 
 homepage            http://www.obspy.org/
 
-checksums           md5     2614bf7f77265f041b25c435745d9048 \
-                    rmd160  0bcbe2925666db9a14d090f3faa51cb09ea2c56a \
-                    sha256  663416b33c7f229514960445e7e4ece7d892d281f3b06d6c65be9f7cc0836319
+checksums           md5     8e6f9c02ea70108b0674e2467b15865b \
+                    rmd160  513adc73cb32579406daffb4d69c758f121f67df \
+                    sha256  fecf7f93d87851a388ce65cfb4e8a2d2e41b3f7765dd212a486eef927b57bc4d
 
-python.versions     26 27 33 34
+python.versions     27 33 34
 
 if {${name} ne ${subport}} {
     depends_build-append    port:py${python.version}-numpy
@@ -47,15 +46,13 @@
                             port:py${python.version}-matplotlib
 
     # suds alternative dependency, Py2 only: suds or suds-jurko
-    if { ${python.version} < 30 } {
-        depends_lib-append \
-            path:${python.pkgd}/suds:py${python.version}-suds-jurko
+    #if { ${python.version} < 30 } {
+    #    depends_lib-append \
+    #        path:${python.pkgd}/suds:py${python.version}-suds-jurko
+    #} else {
+    #    depends_lib-append  port:py${python.version}-suds-jurko
+    #}
 
-        patchfiles-append   patch-setup-suds.py.diff      
-    } else {
-        depends_lib-append  port:py${python.version}-suds-jurko
-    }
-
     # Note: Required for post-installation testing only 
     depends_run-append      port:py${python.version}-flake8 \
                             port:py${python.version}-nose

Deleted: trunk/dports/python/py-obspy-devel/files/patch-setup-suds.py.diff
===================================================================
--- 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)
@@ -1,12 +0,0 @@
---- setup.orig.py
-+++ setup.py
-@@ -92,8 +92,7 @@
-     'scipy',
-     'matplotlib',
-     'lxml',
--    'sqlalchemy',
--    'suds-jurko']
-+    'sqlalchemy' ]
- EXTRAS_REQUIRE = {
-     'tests': ['flake8>=2',
-               'nose',

Modified: trunk/dports/python/py-obspy-devel/files/patch-setup.py.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
 --- setup.orig.py
 +++ setup.py
-@@ -455,7 +455,11 @@
+@@ -528,7 +528,11 @@
      libname = _get_lib_name("tau", add_extension_suffix=False)
      files = glob.glob(os.path.join(path, "*.f"))
      # compiler specific options
@@ -13,7 +13,7 @@
      # XXX: The build subdirectory is difficult to determine if installed
      # via pypi or other means. I could not find a reliable way of doing it.
      new_interface_path = os.path.join("build", libname + os.extsep + "pyf")
-@@ -473,6 +477,20 @@
+@@ -546,6 +550,20 @@
      # gfortran the option -lgcov is required
      if os.environ.get('OBSPY_C_COVERAGE', ""):
          kwargs['libraries'].append('gcov')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141124/fcb52a57/attachment.html>