[83528] trunk/dports/python
stromnov at macports.org
stromnov at macports.org
Sun Sep 4 08:18:14 PDT 2011
Revision: 83528
http://trac.macports.org/changeset/83528
Author: stromnov at macports.org
Date: 2011-09-04 08:18:09 -0700 (Sun, 04 Sep 2011)
Log Message:
-----------
py*-ipython: unify
Modified Paths:
--------------
trunk/dports/python/ipython_select/Portfile
trunk/dports/python/ipython_select/files/base
trunk/dports/python/ipython_select/files/none
trunk/dports/python/py-ipython/Portfile
trunk/dports/python/py-ipython/files/ipython24
Added Paths:
-----------
trunk/dports/python/py-ipython/files/ipython25
trunk/dports/python/py-ipython/files/ipython26
trunk/dports/python/py-ipython/files/ipython27
trunk/dports/python/py-ipython/files/ipython31
trunk/dports/python/py-ipython/files/ipython32
Removed Paths:
-------------
trunk/dports/python/py-ipython/files/patch-setup.py.diff
trunk/dports/python/py25-ipython/
trunk/dports/python/py26-ipython/
trunk/dports/python/py27-ipython/
Modified: trunk/dports/python/ipython_select/Portfile
===================================================================
--- trunk/dports/python/ipython_select/Portfile 2011-09-04 12:29:28 UTC (rev 83527)
+++ trunk/dports/python/ipython_select/Portfile 2011-09-04 15:18:09 UTC (rev 83528)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
@@ -4,7 +5,8 @@
PortGroup select 1.0
name ipython_select
-version 0.1
+version 0.2
+revision 0
categories python
license BSD
maintainers nomaintainer
Modified: trunk/dports/python/ipython_select/files/base
===================================================================
--- trunk/dports/python/ipython_select/files/base 2011-09-04 12:29:28 UTC (rev 83527)
+++ trunk/dports/python/ipython_select/files/base 2011-09-04 15:18:09 UTC (rev 83528)
@@ -1,6 +1,7 @@
bin/ipcluster
bin/ipcontroller
bin/ipengine
+bin/iplogger
bin/iptest
bin/ipython
bin/ipython-wx
@@ -10,6 +11,7 @@
share/man/man1/ipcluster.1.gz
share/man/man1/ipcontroller.1.gz
share/man/man1/ipengine.1.gz
+share/man/man1/iplogger.1.gz
share/man/man1/ipython.1.gz
share/man/man1/ipython-wx.1.gz
share/man/man1/ipythonx.1.gz
Modified: trunk/dports/python/ipython_select/files/none
===================================================================
--- trunk/dports/python/ipython_select/files/none 2011-09-04 12:29:28 UTC (rev 83527)
+++ trunk/dports/python/ipython_select/files/none 2011-09-04 15:18:09 UTC (rev 83528)
@@ -15,3 +15,5 @@
-
-
-
+-
+-
Modified: trunk/dports/python/py-ipython/Portfile
===================================================================
--- trunk/dports/python/py-ipython/Portfile 2011-09-04 12:29:28 UTC (rev 83527)
+++ trunk/dports/python/py-ipython/Portfile 2011-09-04 15:18:09 UTC (rev 83528)
@@ -1,66 +1,148 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
-PortGroup python24 1.0
-PortGroup select 1.0
+PortSystem 1.0
+PortGroup python 1.0
+PortGroup select 1.0
-name py-ipython
-set my_name ipython
-version 0.9.1
-revision 2
-categories python
-platforms darwin
-maintainers nomaintainer
-supported_archs noarch
+set realname ipython
-description An enhanced Interactive Python shell
-long_description Provide an interactive shell superior to Python's default. \
- Serve as an embeddable, ready to use interpreter for your own programs. \
- Offer a flexible framework which can be used as the base environment for \
- other systems with Python as the underlying language. \
- Allow interactive testing of threaded graphical toolkits.
+name py-${realname}
+version 0.11
+revision 0
+categories python
+platforms darwin
+supported_archs noarch
-homepage http://ipython.scipy.org/
-master_sites ${homepage}dist/
-distname ${my_name}-${version}
-checksums md5 8a1bd1a9be272f4ddf4de99e5c1ad0dc \
- sha1 2d069416b31ed03eb1cad36f84ef2337362ac6a9 \
- rmd160 3d522f80290caa72e1c4fc60b2d56369c8c66eba
+maintainers akitada openmaintainer
-use_parallel_build yes
+description An enhanced Interactive Python shell
+long_description Provide an interactive shell superior to Python's default. \
+ Serve as an embeddable, ready to use interpreter for your own programs. \
+ Offer a flexible framework which can be used as the base environment for \
+ other systems with Python as the underlying language. \
+ Allow interactive testing of threaded graphical toolkits.
-depends_lib-append port:py-readline
-depends_run port:ipython_select
+homepage http://ipython.org
+master_sites http://archive.ipython.org/release/${version}
+distname ${realname}-${version}
-test.run yes
+checksums md5 efc899e752a4a4a67a99575cea1719ef \
+ sha1 e658f48502b9bac5a280d34da232303ff599e9af \
+ rmd160 2f9cae582e8a185040b30cd77a2c24ee7699b0e2
-post-destroot {
- foreach f {ipcluster ipcontroller ipengine iptest ipython ipython-wx ipythonx irunner pycolor} {
- move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}${python.branch}
+depends_lib-append port:readline
+
+python.versions 24 25 26 27 31 32
+
+subport py24-${realname} {
+ version 0.9.1
+ revision 3
+ master_sites http://archive.ipython.org/release/${version}
+ distname ${realname}-${version}
+ checksums md5 8a1bd1a9be272f4ddf4de99e5c1ad0dc \
+ sha1 2d069416b31ed03eb1cad36f84ef2337362ac6a9 \
+ rmd160 3d522f80290caa72e1c4fc60b2d56369c8c66eba
+ depends_lib-append port:py-readline
+}
+
+subport py25-${realname} {
+ version 0.10.2
+ revision 1
+ master_sites http://archive.ipython.org/release/${version}
+ distname ${realname}-${version}
+ checksums md5 dda59bfc6e256ce786c4bc4aadb220a4 \
+ sha1 d45b97b0f458fd517cb2bfa9ebb3c671c46a21c0 \
+ rmd160 365a4eb9b534df1a9aa8717f173e9a032224ea01
+}
+
+if {$subport == "py31-${realname}" || $subport == "py32-${realname}"} {
+ master_sites http://archive.ipython.org/release/${version}/py3
+ distname ${realname}-${version}-py3
+ worksrcdir ${realname}-${version}
+ checksums md5 d4a83d38401c6c8c6768cba8a63341db \
+ sha1 8204a5f05f97de2f0f434b7ffc751749b4407f38 \
+ rmd160 6dd414f5e85f2d96c94974fe67c06699f123e360
+}
+
+if {$subport != "py31-${realname}" && $subport != "py32-${realname}" && $subport != $name} {
+ variant scientific description "Use ScientificPython to provide physical quantities support" {
+ if {$subport == "py24-${realname}"} {
+ depends_lib-append port:py-scientific
+ } elseif {$subport != $name} {
+ depends_lib-append port:py${python.version}-scientific
+ }
}
- foreach f {ipython pycolor} {
- move ${destroot}${prefix}/share/man/man1/${f}.1.gz \
- ${destroot}${prefix}/share/man/man1/${f}${python.branch}.1.gz
+ default_variants +scientific
+}
+
+if {$subport == "py26-${realname}" || $subport == "py27-${realname}"} {
+ variant parallel description "Support for parallel computing" {
+ depends_lib-append port:py${python.version}-zmq
}
- move ${destroot}${prefix}/share/doc/${my_name} ${destroot}${prefix}/share/doc/${name}
+ variant pyqt4 conflicts pyside requires parallel description "Support for the Qt console using pyqt4" {
+ depends_lib-append port:py${python.version}-pyqt4 \
+ port:py${python.version}-pygments
+ }
+ variant pyside conflicts pyqt4 requires parallel description "Support for the Qt console using pyside" {
+ depends_lib-append port:py${python.version}-pyside \
+ port:py${python.version}-pygments
+ }
+ # Support for IPython HTML notebook for upcoming 0.12
+ #variant notebook requires parallel description "Support for IPython HTML notebook" {
+ # depends_lib-append port:py${python.version}-tornado
+ #}
}
-select.group $my_name
-select.file ${filespath}/${my_name}[string map {. ""} ${python.branch}]
+if {$subport != $name} {
-notes \
-"To make the Python ${python.branch} version of IPython the one that is run
-when you execute the commands without a version suffix, e.g. 'ipython',
-run:
- port select --set ${select.group} [file tail ${select.file}]"
+ post-destroot {
+ if {$subport == "py24-${realname}"} {
+ foreach f {ipcluster ipcontroller ipengine iptest ipython ipython-wx ipythonx irunner pycolor} {
+ move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}-${python.branch}
+ }
+ foreach f {ipython pycolor} {
+ move ${destroot}${prefix}/share/man/man1/${f}.1.gz \
+ ${destroot}${prefix}/share/man/man1/${f}-${python.branch}.1.gz
+ }
+ move ${destroot}${prefix}/share/doc/${realname} ${destroot}${prefix}/share/doc/${name}
+ } elseif {$subport == "py25-${realname}"} {
+ foreach f {ipcluster ipcontroller ipengine iptest ipython ipython-wx ipythonx irunner pycolor} {
+ move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}-${python.branch}
+ }
+ foreach f {ipcluster ipcontroller ipengine ipython ipython-wx ipythonx irunner pycolor} {
+ move ${destroot}${prefix}/share/man/man1/${f}.1.gz \
+ ${destroot}${prefix}/share/man/man1/${f}-${python.branch}.1.gz
+ }
+ move ${destroot}${prefix}/share/doc/${realname} ${destroot}${prefix}/share/doc/${name}
+ } elseif {$subport == "py26-${realname}" || $subport == "py27-${realname}"} {
+ foreach f {ipcluster ipcontroller ipengine iplogger ipython irunner pycolor} {
+ ln -s ${python.prefix}/share/man/man1/${f}.1.gz ${destroot}${prefix}/share/man/man1/${f}-${python.branch}.1.gz
+ }
+ } elseif {$subport == "py31-${realname}" || $subport == "py32-${realname}"} {
+ foreach f {ipcluster ipcontroller ipengine iplogger ipython irunner pycolor} {
+ ln -s ${python.prefix}/share/man/man1/${f}.1.gz ${destroot}${prefix}/share/man/man1/${f}3-${python.branch}.1.gz
+ }
+ }
+ }
-variant scientific description "Use ScientificPython to provide physical quantities support" {
- depends_lib-append port:py-scientific
+ depends_run port:ipython_select
+ test.run no
+
+ select.group ${realname}
+ select.file ${filespath}/${realname}${python.version}
+
+ notes \
+ "To make the Python ${python.branch} version of IPython the one that is run
+ when you execute the commands without a version suffix, e.g. 'ipython',
+ run:
+ port select --set ${select.group} [file tail ${select.file}]"
}
-default_variants +scientific
-
-livecheck.type regex
-livecheck.url ${master_sites}?C=M&O=D
-livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*)
+if {$subport == "py24-${realname}" || $subport == "py25-${realname}"} {
+ livecheck.type none
+} else {
+ livecheck.type regex
+ livecheck.url ${homepage}/download.html
+ livecheck.regex ${realname}-(\\d+(?:\\.\\d+)*)
+}
Modified: trunk/dports/python/py-ipython/files/ipython24
===================================================================
--- trunk/dports/python/py-ipython/files/ipython24 2011-09-04 12:29:28 UTC (rev 83527)
+++ trunk/dports/python/py-ipython/files/ipython24 2011-09-04 15:18:09 UTC (rev 83528)
@@ -1,17 +1,19 @@
-bin/ipcluster2.4
-bin/ipcontroller2.4
-bin/ipengine2.4
-bin/iptest2.4
-bin/ipython2.4
-bin/ipython-wx2.4
-bin/ipythonx2.4
-bin/irunner2.4
-bin/pycolor2.4
+bin/ipcluster-2.4
+bin/ipcontroller-2.4
+bin/ipengine-2.4
-
+bin/iptest-2.4
+bin/ipython-2.4
+bin/ipython-wx-2.4
+bin/ipythonx-2.4
+bin/irunner-2.4
+bin/pycolor-2.4
-
-
-share/man/man1/ipython2.4.1.gz
-
-
+share/man/man1/ipython-2.4.1.gz
-
-share/man/man1/pycolor2.4.1.gz
+-
+-
+share/man/man1/pycolor-2.4.1.gz
Added: trunk/dports/python/py-ipython/files/ipython25
===================================================================
--- trunk/dports/python/py-ipython/files/ipython25 (rev 0)
+++ trunk/dports/python/py-ipython/files/ipython25 2011-09-04 15:18:09 UTC (rev 83528)
@@ -0,0 +1,19 @@
+bin/ipcluster-2.5
+bin/ipcontroller-2.5
+bin/ipengine-2.5
+-
+bin/iptest-2.5
+bin/ipython-2.5
+bin/ipython-wx-2.5
+bin/ipythonx-2.5
+bin/irunner-2.5
+bin/pycolor-2.5
+share/man/man1/ipcluster-2.5.1.gz
+share/man/man1/ipcontroller-2.5.1.gz
+share/man/man1/ipengine-2.5.1.gz
+-
+share/man/man1/ipython-2.5.1.gz
+share/man/man1/ipython-wx-2.5.1.gz
+share/man/man1/ipythonx-2.5.1.gz
+share/man/man1/irunner-2.5.1.gz
+share/man/man1/pycolor-2.5.1.gz
Added: trunk/dports/python/py-ipython/files/ipython26
===================================================================
--- trunk/dports/python/py-ipython/files/ipython26 (rev 0)
+++ trunk/dports/python/py-ipython/files/ipython26 2011-09-04 15:18:09 UTC (rev 83528)
@@ -0,0 +1,19 @@
+${frameworks_dir}/Python.framework/Versions/2.6/bin/ipcluster
+${frameworks_dir}/Python.framework/Versions/2.6/bin/ipcontroller
+${frameworks_dir}/Python.framework/Versions/2.6/bin/ipengine
+${frameworks_dir}/Python.framework/Versions/2.6/bin/iplogger
+${frameworks_dir}/Python.framework/Versions/2.6/bin/iptest
+${frameworks_dir}/Python.framework/Versions/2.6/bin/ipython
+-
+-
+${frameworks_dir}/Python.framework/Versions/2.6/bin/irunner
+${frameworks_dir}/Python.framework/Versions/2.6/bin/pycolor
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/ipcluster.1.gz
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/ipcontroller.1.gz
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/ipengine.1.gz
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/iplogger.1.gz
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/ipython.1.gz
+-
+-
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/irunner.1.gz
+${frameworks_dir}/Python.framework/Versions/2.6/share/man/man1/pycolor.1.gz
Added: trunk/dports/python/py-ipython/files/ipython27
===================================================================
--- trunk/dports/python/py-ipython/files/ipython27 (rev 0)
+++ trunk/dports/python/py-ipython/files/ipython27 2011-09-04 15:18:09 UTC (rev 83528)
@@ -0,0 +1,19 @@
+${frameworks_dir}/Python.framework/Versions/2.7/bin/ipcluster
+${frameworks_dir}/Python.framework/Versions/2.7/bin/ipcontroller
+${frameworks_dir}/Python.framework/Versions/2.7/bin/ipengine
+${frameworks_dir}/Python.framework/Versions/2.7/bin/iplogger
+${frameworks_dir}/Python.framework/Versions/2.7/bin/iptest
+${frameworks_dir}/Python.framework/Versions/2.7/bin/ipython
+-
+-
+${frameworks_dir}/Python.framework/Versions/2.7/bin/irunner
+${frameworks_dir}/Python.framework/Versions/2.7/bin/pycolor
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/ipcluster.1.gz
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/ipcontroller.1.gz
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/ipengine.1.gz
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/iplogger.1.gz
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/ipython.1.gz
+-
+-
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/irunner.1.gz
+${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/pycolor.1.gz
Added: trunk/dports/python/py-ipython/files/ipython31
===================================================================
--- trunk/dports/python/py-ipython/files/ipython31 (rev 0)
+++ trunk/dports/python/py-ipython/files/ipython31 2011-09-04 15:18:09 UTC (rev 83528)
@@ -0,0 +1,19 @@
+${frameworks_dir}/Python.framework/Versions/3.1/bin/ipcluster3
+${frameworks_dir}/Python.framework/Versions/3.1/bin/ipcontroller3
+${frameworks_dir}/Python.framework/Versions/3.1/bin/ipengine3
+${frameworks_dir}/Python.framework/Versions/3.1/bin/iplogger3
+${frameworks_dir}/Python.framework/Versions/3.1/bin/iptest3
+${frameworks_dir}/Python.framework/Versions/3.1/bin/ipython3
+-
+-
+${frameworks_dir}/Python.framework/Versions/3.1/bin/irunner3
+${frameworks_dir}/Python.framework/Versions/3.1/bin/pycolor3
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/ipcluster.1.gz
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/ipcontroller.1.gz
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/ipengine.1.gz
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/iplogger.1.gz
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/ipython.1.gz
+-
+-
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/irunner.1.gz
+${frameworks_dir}/Python.framework/Versions/3.1/share/man/man1/pycolor.1.gz
Added: trunk/dports/python/py-ipython/files/ipython32
===================================================================
--- trunk/dports/python/py-ipython/files/ipython32 (rev 0)
+++ trunk/dports/python/py-ipython/files/ipython32 2011-09-04 15:18:09 UTC (rev 83528)
@@ -0,0 +1,19 @@
+${frameworks_dir}/Python.framework/Versions/3.2/bin/ipcluster3
+${frameworks_dir}/Python.framework/Versions/3.2/bin/ipcontroller3
+${frameworks_dir}/Python.framework/Versions/3.2/bin/ipengine3
+${frameworks_dir}/Python.framework/Versions/3.2/bin/iplogger3
+${frameworks_dir}/Python.framework/Versions/3.2/bin/iptest3
+${frameworks_dir}/Python.framework/Versions/3.2/bin/ipython3
+-
+-
+${frameworks_dir}/Python.framework/Versions/3.2/bin/irunner3
+${frameworks_dir}/Python.framework/Versions/3.2/bin/pycolor3
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/ipcluster.1.gz
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/ipcontroller.1.gz
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/ipengine.1.gz
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/iplogger.1.gz
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/ipython.1.gz
+-
+-
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/irunner.1.gz
+${frameworks_dir}/Python.framework/Versions/3.2/share/man/man1/pycolor.1.gz
Deleted: trunk/dports/python/py-ipython/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-ipython/files/patch-setup.py.diff 2011-09-04 12:29:28 UTC (rev 83527)
+++ trunk/dports/python/py-ipython/files/patch-setup.py.diff 2011-09-04 15:18:09 UTC (rev 83528)
@@ -1,11 +0,0 @@
---- work/ipython-0.7.0/setup.py 2005-12-25 01:46:14.000000000 +0100
-+++ setup.py 2006-01-10 09:27:58.000000000 +0100
-@@ -106,7 +106,7 @@
- # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
- # information on how to do this more cleanly once python 2.4 can be assumed.
- # Thanks to Noel for the tip.
--docdirbase = 'share/doc/ipython'
-+docdirbase = 'share/doc/py-ipython'
- manpagebase = 'share/man/man1'
-
- # We only need to exclude from this things NOT already excluded in the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110904/1027dc70/attachment.html>
More information about the macports-changes
mailing list