[117399] users/mojca/wxports/python/py-pyphant
mojca at macports.org
mojca at macports.org
Tue Feb 25 07:12:32 PST 2014
Revision: 117399
https://trac.macports.org/changeset/117399
Author: mojca at macports.org
Date: 2014-02-25 07:12:32 -0800 (Tue, 25 Feb 2014)
Log Message:
-----------
mojca/py-pyphant: upgade to 1.0b3
Modified Paths:
--------------
users/mojca/wxports/python/py-pyphant/Portfile
users/mojca/wxports/python/py-pyphant/files/pyphant
users/mojca/wxports/python/py-pyphant/files/pyphant.quartz
Modified: users/mojca/wxports/python/py-pyphant/Portfile
===================================================================
--- users/mojca/wxports/python/py-pyphant/Portfile 2014-02-25 11:29:05 UTC (rev 117398)
+++ users/mojca/wxports/python/py-pyphant/Portfile 2014-02-25 15:12:32 UTC (rev 117399)
@@ -2,15 +2,16 @@
# $Id$
PortSystem 1.0
-PortGroup app 1.0
PortGroup python 1.0
PortGroup wxWidgets 1.0
PortGroup active_variants 1.1
name py-pyphant
-version 1.0b2
+version 1.0b3
+# revision 1
categories-append science
-maintainers rowue
+maintainers fmf.uni-freiburg.de:servicegruppe.wissinfo \
+ fmf.uni-freiburg.de:alexander.held rowue
description python framework for analysing and managing scientific data
long_description The python framework pyphant allows for the creation \
and application of data flow models. The central idea \
@@ -37,13 +38,12 @@
# http://pyphant.sourceforge.net
# https://github.com/SGWissInfo/pyphant1
homepage http://www.fmf.uni-freiburg.de/service/servicegruppen/sg_wissinfo/projekte/Pyphant/
+license BSD
platforms darwin
-# Default version is set to 2.6 because of its incompatibility with wxWidgets 3.0.
-# Once it becomes compatible with wxPython 2.9/3.0, default python version will be set to 2.7.
python.versions 26 27
-python.default_version 26
+python.default_version 27
# py-scipy is not universal
universal_variant no
@@ -51,88 +51,74 @@
distname pyphant
master_sites sourceforge:pyphant
-if {$subport != $name} {
+use_configure no
- use_configure no
+if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-setuptools
+
+ if [string match {py??-pyphant-*} ${subport}] {
+ depends_lib-append port:py${python.version}-pyphant
+ }
}
foreach python.vers ${python.versions} {
subport py${python.vers}-${distname} {
+ PortGroup app 1.0
set python.version ${python.vers}
worksrcdir ${distname}-${version}
distfiles ${distname}-${version}${extract.suffix}
- checksums rmd160 76f6d419e97a2ec964065e68ec271733eb90cec1 \
- sha256 c90b7735ca40ddaf8bc0865056b4157813a2176ed156080fa5bec866cdacf4c7
+ checksums rmd160 aa56f61a73300651730f867b249264e2ca63d200 \
+ sha256 c873352467f9ecf96fac03082e3cbc4153d13f8103e5339e608897884867db53
- app.name Pyphant
- ## the following doesn't work; most probably post-destroot directives
- ## from python & app aren't executed in the right order
- # app.executable wxPyphant-${python.branch}
- app.executable ${python.prefix}/bin/wxPyphant
+ app.name Pyphant-${python.branch}
+ app.executable pyphant-${python.branch}
app.icon ${filespath}/Pyphant.icns
# TODO: check which ones of these are runtime dependencies as opposed to dependencies for building
- # I'm not really sure that this is compatible with wxWidgets 2.9
- depends_lib-append port:py${python.version}-scipy \
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy \
port:py${python.version}-setuptools \
port:py${python.version}-tables \
- port:py${python.version}-antlr3 \
port:py${python.version}-matplotlib \
- port:py${python.version}-scientific \
port:py${python.version}-simplejson \
port:py${python.version}-paste \
port:py${python.version}-mx-base \
port:py${python.version}-sogl \
- port:py${python.version}-${distname}-fmf \
- port:py${python.version}-${distname}-imageprocessing \
- port:py${python.version}-${distname}-osc \
- port:py${python.version}-${distname}-statistics \
- port:py${python.version}-${distname}-tools
+
depends_run-append port:py${python.version}-configobj \
port:py${python.version}-tornado
- variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use 32-bit carbon-based wxPython 2.8} {
+ # TODO: remove support for wxGTK one day
+ variant wxgtk28 conflicts wxwidgets30 description {Use 32-bit carbon-based wxPython 2.8} {
wxWidgets.use wxGTK-2.8
depends_lib-append port:py${python.version}-wxpython-2.8
require_active_variants py${python.version}-wxpython-2.8 gtk
}
- variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use wxPython 2.8 with GTK} {
- wxWidgets.use wxWidgets-2.8
- depends_lib-append port:py${python.version}-wxpython-2.8
- require_active_variants py${python.version}-wxpython-2.8 carbon
- }
- variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxPython 3.0} {
+ variant wxwidgets30 conflicts wxgtk28 escription {Use wxPython 3.0} {
wxWidgets.use wxPython-3.0
depends_lib-append port:py${python.version}-wxpython-3.0
}
-
- if {![variant_isset wxgtk28] && ![variant_isset wxwidgets28] && ![variant_isset wxwidgets30]} {
- if {[vercmp $xcodeversion 4.4] >= 0} {
+ if {![variant_isset wxgtk28] && ![variant_isset wxwidgets30]} {
+ # TODO: check which version of py${python.version}-wxpython-X.Y is installed instead
+ # and use 3.0 by default unless py2.x-wxpython-2.8 is already active
+ if {${python.version} == 26} {
default_variants +wxgtk28
} else {
- default_variants +wxwidgets28
+ default_variants +wxwidgets30
}
}
-
- # TODO: the scripts should be modified, in particular pyphant and pyphant.quartz
- # most probably the app PortGroup could be used instead
- # post-destroot {
- # xinstall -m 755 -d ${destroot}${applications_dir}/Pyphant.app/Contents/MacOS
- # if {[variant_isset carbon]} {
- # xinstall ${filespath}/pyphant.quartz ${destroot}${applications_dir}/Pyphant.app/Contents/MacOS/Pyphant
- # } else {
- # xinstall ${filespath}/pyphant ${destroot}${applications_dir}/Pyphant.app/Contents/MacOS/Pyphant
- # reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${applications_dir}/Pyphant.app/Contents/MacOS/Pyphant
- # }
- # reinplace "s|@PREFIX@|${prefix}|" ${destroot}${applications_dir}/Pyphant.app/Contents/MacOS/Pyphant
- # xinstall -m 755 -d ${destroot}${applications_dir}/Pyphant.app/Contents/Resources
- # xinstall -m 0644 ${filespath}/Pyphant.icns ${destroot}${applications_dir}/Pyphant.app/Contents/Resources
- # xinstall -m 0644 ${filespath}/Info.plist ${destroot}${applications_dir}/Pyphant.app/Contents/
- # reinplace "s|@VERSION@|${version}|" ${destroot}${applications_dir}/Pyphant.app/Contents/Info.plist
- # system "echo 'APPL????' > ${destroot}${applications_dir}/Pyphant.app/Contents/PkgInfo"
- # }
- # variant carbon description {Install pyphant with carbon support} {}
+ pre-destroot {
+ if {[variant_isset wxwidgets30]} {
+ file copy ${filespath}/pyphant.quartz ${destroot}${prefix}/bin
+ file rename ${destroot}${prefix}/bin/pyphant.quartz ${destroot}${prefix}/bin/pyphant-${python.branch}
+ } else {
+ file copy ${filespath}/pyphant ${destroot}${prefix}/bin
+ file rename ${destroot}${prefix}/bin/pyphant ${destroot}${prefix}/bin/pyphant-${python.branch}
+ reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+ }
+ reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+ reinplace "s|@PYTHONBRANCH@|${python.branch}|" ${destroot}${prefix}/bin/pyphant-${python.branch}
+ }
}
subport py${python.vers}-${distname}-fmf {
@@ -146,11 +132,8 @@
accessible from the pyphant GUI.
distname ${distname}.fmf-${version}
- checksums rmd160 dbbeb277bdb61f9760f1cc723f58f20c377fe0e6 \
- sha256 711f9115b695a6b6d023e5b1f968cff186adeb5a0024e30c927df7a30f0f1d11
-
- # does this need "append"?
- depends_build port:py${python.version}-setuptools
+ checksums rmd160 42d70609400f636b2c4ffced5e5f2192f76ac4ad \
+ sha256 8ef7acf200f6a7a8805d4f91680fd771129f1c68178d8d710b7a9a322267cdfc
}
subport py${python.vers}-${distname}-imageprocessing {
@@ -165,10 +148,13 @@
light microscopy photographs.
distname ${distname}.imageprocessing-${version}
- checksums rmd160 f69719739e3daa18eb75467bce629fc2b3aef25f \
- sha256 2ea087b6eed458dec193f6f1c2f5652dcb54da0536b79583ab623e610ed7d7e1
+ checksums rmd160 e4d160989c0e5b07528577052dd451b47828a7d4 \
+ sha256 9e1619cf3abbe94ce785b9b5b02383b5a31f9ba2ef0bc75922c785195620229f
- depends_lib-append port:py${python.version}-pil
+ # numpy and scipy are already dependencies of pyphant
+ depends_lib-append port:py${python.version}-pil \
+ port:py${python.version}-numpy \
+ port:py${python.version}-scipy
}
subport py${python.vers}-${distname}-osc {
@@ -184,8 +170,12 @@
a wide range of problems.
distname ${distname}.osc-${version}
- checksums rmd160 b7ed725ff7a342c1c5c3216a700c25e65dd741b2 \
- sha256 61876ab82700e4496441d8a4a52b55b1143272da6491225a1f013bb36af7b369
+ checksums rmd160 1093b2a9b036648f76089f5d1b919186b7a2dd2c \
+ sha256 ba573aaa5cb78c4f692798e2c6845f4a0b11b99d721905be56c47db1885d3e67
+
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy \
+ port:py${python.version}-matplotlib
}
subport py${python.vers}-${distname}-statistics {
@@ -196,8 +186,11 @@
array-like data.
distname ${distname}.statistics-${version}
- checksums rmd160 15d55907509feaea8851c41a5326b41b8debe501 \
- sha256 255fd2630aacb4860e63932a633538e31466d72b9e283c1f4ee0037f81d17f94
+ checksums rmd160 893f87f8d9b206a71a963ba30be37e2fd4bb002f \
+ sha256 ae71e825508fe74c88693108a7bc0612416fdabb1e71442c815ccbfe2b37c7cb
+
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy
}
subport py${python.vers}-${distname}-tools {
@@ -206,14 +199,14 @@
long_description This toolbox currently provides two workers for the \
py${python.version}-pyphant framework. These workers can be integrated \
in a data flow model and simply serve as data sources for \
- data that is managed by a py26-pyphant core module called \
+ data that is managed by a py${python.version}-pyphant core module called \
KnowledgeManager (KM). The KM accumulates metadata in a \
sqlite3 database and the above mentioned workers present \
parameters to perform a metadata search and finally \
load and provide the data that matched the search.
distname ${distname}.tools-${version}
- checksums rmd160 fc07b4f5ce32e3429bc3e82f856685815e307e35 \
- sha256 a5b16be4bdcd8974254c8ac60826ff73d13ecd06b807f5aa2e43c1edee418dd6
+ checksums rmd160 7eabbd970968bd118a9fd93670bf79e48790d130 \
+ sha256 1d97e9b5b798047aa529148e8c5356cdbc61a3333394b5e72e8cf6b429c3b23f
}
}
Modified: users/mojca/wxports/python/py-pyphant/files/pyphant
===================================================================
--- users/mojca/wxports/python/py-pyphant/files/pyphant 2014-02-25 11:29:05 UTC (rev 117398)
+++ users/mojca/wxports/python/py-pyphant/files/pyphant 2014-02-25 15:12:32 UTC (rev 117399)
@@ -1,6 +1,8 @@
#!/bin/bash
if [ -x @APPDIR@/X11.app/Contents/MacOS/X11 ]; then
- open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
+ open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
+elif [ -x /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 ]; then
+ open -a /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
else
- open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant-2.6
+ open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
fi
Modified: users/mojca/wxports/python/py-pyphant/files/pyphant.quartz
===================================================================
--- users/mojca/wxports/python/py-pyphant/files/pyphant.quartz 2014-02-25 11:29:05 UTC (rev 117398)
+++ users/mojca/wxports/python/py-pyphant/files/pyphant.quartz 2014-02-25 15:12:32 UTC (rev 117399)
@@ -2,4 +2,4 @@
LOGNAME=`logname`
export LOGNAME
cd $HOME
-exec @PREFIX@/bin/wxPyphant-2.6
+ at PREFIX@/bin/wxPyphant- at PYTHONBRANCH@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140225/c08b121c/attachment.html>
More information about the macports-changes
mailing list