Revision: 139620 https://trac.macports.org/changeset/139620 Author: stromnov@macports.org Date: 2015-08-21 13:42:53 -0700 (Fri, 21 Aug 2015) Log Message: ----------- py-ipython: update to version 4.0.0 (#48580) Modified Paths: -------------- trunk/dports/python/ipython2_select/Portfile trunk/dports/python/ipython2_select/files/base trunk/dports/python/ipython2_select/files/none trunk/dports/python/ipython3_select/Portfile trunk/dports/python/ipython3_select/files/base trunk/dports/python/ipython3_select/files/none 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 Added Paths: ----------- trunk/dports/python/ipython2_select/ trunk/dports/python/ipython3_select/ trunk/dports/python/py-ipython/files/py27-ipython trunk/dports/python/py-ipython/files/py27-ipython2 trunk/dports/python/py-ipython/files/py34-ipython trunk/dports/python/py-ipython/files/py34-ipython3 Removed Paths: ------------- trunk/dports/python/py-ipython/files/ipython27 trunk/dports/python/py-ipython/files/ipython34 Modified: trunk/dports/python/ipython2_select/Portfile =================================================================== --- trunk/dports/python/ipython_select/Portfile 2015-08-21 17:38:47 UTC (rev 139616) +++ trunk/dports/python/ipython2_select/Portfile 2015-08-21 20:42:53 UTC (rev 139620) @@ -4,29 +4,29 @@ PortSystem 1.0 PortGroup select 1.0 -name ipython_select -version 0.3 -revision 1 +name ipython2_select +version 0.1 +revision 0 categories python +platforms darwin license BSD +supported_archs noarch + maintainers nomaintainer -description common files for selecting default ipython version -long_description \ - This port installs files that allow 'port select' to be used to \ - create links to the preferred default version of ipython. -platforms darwin -supported_archs noarch +description Common files for selecting default IPython2 version +long_description This port installs files that allow 'port select' \ + to create links to the preferred default version \ + of IPython2. homepage http://www.macports.org/ distfiles - use_configure no -build {} -destroot { - select::install ipython ${filespath}/base - select::install ipython ${filespath}/none -} +build {} +destroot {} +select.entries {ipython2 base} \ + {ipython2 none} + livecheck.type none Modified: trunk/dports/python/ipython2_select/files/base =================================================================== --- trunk/dports/python/ipython_select/files/base 2015-08-21 17:38:47 UTC (rev 139616) +++ trunk/dports/python/ipython2_select/files/base 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +1,3 @@ -bin/ipcluster -bin/ipcontroller -bin/ipengine -bin/iplogger -bin/iptest -bin/ipython -bin/ipython-wx -bin/ipythonx -bin/irunner -bin/pycolor -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 -share/man/man1/irunner.1.gz -share/man/man1/pycolor.1.gz +bin/iptest2 +bin/ipython2 +share/man/man1/ipython2.1 Modified: trunk/dports/python/ipython2_select/files/none =================================================================== --- trunk/dports/python/ipython_select/files/none 2015-08-21 17:38:47 UTC (rev 139616) +++ trunk/dports/python/ipython2_select/files/none 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +1,3 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Modified: trunk/dports/python/ipython3_select/Portfile =================================================================== --- trunk/dports/python/ipython_select/Portfile 2015-08-21 17:38:47 UTC (rev 139616) +++ trunk/dports/python/ipython3_select/Portfile 2015-08-21 20:42:53 UTC (rev 139620) @@ -4,29 +4,29 @@ PortSystem 1.0 PortGroup select 1.0 -name ipython_select -version 0.3 -revision 1 +name ipython3_select +version 0.1 +revision 0 categories python +platforms darwin license BSD +supported_archs noarch + maintainers nomaintainer -description common files for selecting default ipython version -long_description \ - This port installs files that allow 'port select' to be used to \ - create links to the preferred default version of ipython. -platforms darwin -supported_archs noarch +description Common files for selecting default IPython3 version +long_description This port installs files that allow 'port select' \ + to create links to the preferred default version \ + of IPython3. homepage http://www.macports.org/ distfiles - use_configure no -build {} -destroot { - select::install ipython ${filespath}/base - select::install ipython ${filespath}/none -} +build {} +destroot {} +select.entries {ipython3 base} \ + {ipython3 none} + livecheck.type none Modified: trunk/dports/python/ipython3_select/files/base =================================================================== --- trunk/dports/python/ipython_select/files/base 2015-08-21 17:38:47 UTC (rev 139616) +++ trunk/dports/python/ipython3_select/files/base 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +1,3 @@ -bin/ipcluster -bin/ipcontroller -bin/ipengine -bin/iplogger -bin/iptest -bin/ipython -bin/ipython-wx -bin/ipythonx -bin/irunner -bin/pycolor -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 -share/man/man1/irunner.1.gz -share/man/man1/pycolor.1.gz +bin/iptest3 +bin/ipython3 +share/man/man1/ipython3.1 Modified: trunk/dports/python/ipython3_select/files/none =================================================================== --- trunk/dports/python/ipython_select/files/none 2015-08-21 17:38:47 UTC (rev 139616) +++ trunk/dports/python/ipython3_select/files/none 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +1,3 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Modified: trunk/dports/python/ipython_select/Portfile =================================================================== --- trunk/dports/python/ipython_select/Portfile 2015-08-21 20:38:28 UTC (rev 139619) +++ trunk/dports/python/ipython_select/Portfile 2015-08-21 20:42:53 UTC (rev 139620) @@ -5,28 +5,28 @@ PortGroup select 1.0 name ipython_select -version 0.3 -revision 1 +version 0.4 +revision 0 categories python +platforms darwin license BSD +supported_archs noarch + maintainers nomaintainer -description common files for selecting default ipython version -long_description \ - This port installs files that allow 'port select' to be used to \ - create links to the preferred default version of ipython. -platforms darwin -supported_archs noarch +description Common files for selecting default IPython version +long_description This port installs files that allow 'port select' \ + to create links to the preferred default version \ + of IPython. homepage http://www.macports.org/ distfiles - use_configure no -build {} -destroot { - select::install ipython ${filespath}/base - select::install ipython ${filespath}/none -} +build {} +destroot {} +select.entries {ipython base} \ + {ipython none} + livecheck.type none Modified: trunk/dports/python/ipython_select/files/base =================================================================== --- trunk/dports/python/ipython_select/files/base 2015-08-21 20:38:28 UTC (rev 139619) +++ trunk/dports/python/ipython_select/files/base 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +1,3 @@ -bin/ipcluster -bin/ipcontroller -bin/ipengine -bin/iplogger bin/iptest bin/ipython -bin/ipython-wx -bin/ipythonx -bin/irunner -bin/pycolor -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 -share/man/man1/irunner.1.gz -share/man/man1/pycolor.1.gz +share/man/man1/ipython.1 Modified: trunk/dports/python/ipython_select/files/none =================================================================== --- trunk/dports/python/ipython_select/files/none 2015-08-21 20:38:28 UTC (rev 139619) +++ trunk/dports/python/ipython_select/files/none 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +1,3 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Modified: trunk/dports/python/py-ipython/Portfile =================================================================== --- trunk/dports/python/py-ipython/Portfile 2015-08-21 20:38:28 UTC (rev 139619) +++ trunk/dports/python/py-ipython/Portfile 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,121 +1,80 @@ -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim: fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 PortGroup python 1.0 PortGroup select 1.0 -set realname ipython - -name py-${realname} -version 3.2.1 +name py-ipython +version 4.0.0 revision 0 +categories-append devel science platforms darwin license BSD supported_archs noarch python.versions 27 34 -maintainers aronnax sean openmaintainer +maintainers aronnax sean stromnov openmaintainer -description An enhanced Interactive Python shell -long_description Provide an interactive shell superior to the Python 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. +description An enhanced interactive Python shell. +long_description ${description} homepage http://ipython.org -master_sites https://pypi.python.org/packages/source/i/ipython/ +master_sites pypi:[string index ${python.rootname} 0]/${python.rootname} -distname ${realname}-${version} +distname ${python.rootname}-${version} -checksums rmd160 5b1d991bf2095edb8fdf80e1855b625cc5a1e98a \ - sha256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 +checksums rmd160 b568015ab7d7207d587ab2140d97c80a1228a65f \ + sha256 2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da -if {${name} ne ${subport} && ${python.version} == 27} { - variant scientific description "Use ScientificPython to provide physical quantities support" { - depends_lib-append port:py${python.version}-scientific - } - default_variants +scientific -} - if {${name} ne ${subport}} { - variant parallel description "Support for parallel computing" { - depends_lib-append port:py${python.version}-zmq - } + set python_major [string range ${python.version} 0 end-1] - variant pyqt4 conflicts pyside requires parallel description "Support for the Qt console using pyqt4" { - # Can use either py*-pyqt4 or py*-pyqt4-devel. - depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \ - port:py${python.version}-pygments - } + depends_lib-append port:ipython_select \ + port:ipython${python_major}_select \ + port:py${python.version}-decorator \ + port:py${python.version}-pickleshare \ + port:py${python.version}-simplegeneric \ + port:py${python.version}-traitlets \ + port:py${python.version}-pexpect \ + port:py${python.version}-appnope \ + port:py${python.version}-gnureadline \ - 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 + variant parallel description "Support for parallel computing (deprecated variant)" { + depends_run-append port:py${python.version}-pyparallel } - variant terminal requires notebook description "Support for the terminal emulation" { - depends_lib-append port:py${python.version}-terminado + variant pyqt4 conflicts pyside description "Support for the Qt console using pyqt4 (deprecated variant)" { + depends_run-append port:py${python.version}-qtconsole \ + path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 } - variant notebook requires parallel description "Support for IPython HTML notebook" { - depends_lib-append port:py${python.version}-jinja2 \ - port:py${python.version}-requests \ - port:py${python.version}-sphinx \ - port:py${python.version}-tornado \ - port:py${python.version}-jsonschema \ - port:py${python.version}-mistune - - notes-append " -Exporting notebooks as HTML or other formats requires pandoc. If you wish to\ -use this feature, then to install pandoc, run: - -port install pandoc - - -" + variant pyside conflicts pyqt4 description "Support for the Qt console using pyside (deprecated variant)" { + depends_run-append port:py${python.version}-qtconsole \ + port:py${python.version}-pyside } - default_variants-append +notebook - depends_lib-append port:py${python.version}-readline - depends_run port:ipython_select - - if {${python.version} >= 30} { - depends_build-append port:py${python.version}-setuptools + variant terminal description "Support for the terminal emulation (deprecated variant)" { + depends_run-append port:py${python.version}-notebook } - depends_build-append port:gzip - - post-destroot { - # Since IPython 0.13, the man pages are no longer gzipped, so to ensure - # that ipython_select works correctly, we gzip the man pages. - set gzip [findBinary gzip ${portutil::autoconf::gzip_path}] - foreach f {ipcluster ipcontroller ipengine ipython} { - system "$gzip -9vf ${destroot}${python.prefix}/share/man/man1/${f}.1" - file attributes ${destroot}${python.prefix}/share/man/man1/${f}.1.gz -permissions 00444 - ln -s ${python.prefix}/share/man/man1/${f}.1.gz ${destroot}${prefix}/share/man/man1/${f}-${python.branch}.1.gz - } + variant notebook description "Support for IPython HTML notebook (deprecated variant)" { + depends_run-append port:py${python.version}-notebook } - test.run no + select.entries [list ipython py${python.version}-ipython py${python.version}-ipython] \ + [list ipython${python_major} py${python.version}-ipython py${python.version}-ipython] - select.group ${realname} - select.file ${filespath}/${realname}${python.version} + notes " +To make this the default IPython or IPython${python_major} (i.e., the version run by\ +the 'ipython' or 'ipython${python_major}' commands), run one or both of: - notes-append " -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: + sudo port select --set ipython py${python.version}-ipython + sudo port select --set ipython${python_major} py${python.version}-ipython + " -port select --set ${select.group} [file tail ${select.file}] - - -" - - livecheck.type none + livecheck.type none } else { - livecheck.type regex - livecheck.url https://pypi.python.org/pypi/ipython/json - livecheck.regex {ipython-(\d+(?:\.\d+)*)\.[tz]} + livecheck.type pypi } Deleted: trunk/dports/python/py-ipython/files/ipython27 =================================================================== --- trunk/dports/python/py-ipython/files/ipython27 2015-08-21 20:38:28 UTC (rev 139619) +++ trunk/dports/python/py-ipython/files/ipython27 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +0,0 @@ -${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/iptest -${frameworks_dir}/Python.framework/Versions/2.7/bin/ipython -- -- -- -- -${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/ipython.1.gz -- -- -- -- Deleted: trunk/dports/python/py-ipython/files/ipython34 =================================================================== --- trunk/dports/python/py-ipython/files/ipython34 2015-08-21 20:38:28 UTC (rev 139619) +++ trunk/dports/python/py-ipython/files/ipython34 2015-08-21 20:42:53 UTC (rev 139620) @@ -1,19 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/3.4/bin/ipcluster3 -${frameworks_dir}/Python.framework/Versions/3.4/bin/ipcontroller3 -${frameworks_dir}/Python.framework/Versions/3.4/bin/ipengine3 -- -${frameworks_dir}/Python.framework/Versions/3.4/bin/iptest3 -${frameworks_dir}/Python.framework/Versions/3.4/bin/ipython3 -- -- -- -- -${frameworks_dir}/Python.framework/Versions/3.4/share/man/man1/ipcluster.1.gz -${frameworks_dir}/Python.framework/Versions/3.4/share/man/man1/ipcontroller.1.gz -${frameworks_dir}/Python.framework/Versions/3.4/share/man/man1/ipengine.1.gz -- -${frameworks_dir}/Python.framework/Versions/3.4/share/man/man1/ipython.1.gz -- -- -- -- Copied: trunk/dports/python/py-ipython/files/py27-ipython (from rev 139619, trunk/dports/python/py-ipython/files/ipython27) =================================================================== --- trunk/dports/python/py-ipython/files/py27-ipython (rev 0) +++ trunk/dports/python/py-ipython/files/py27-ipython 2015-08-21 20:42:53 UTC (rev 139620) @@ -0,0 +1,3 @@ +${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/share/man/man1/ipython.1 Copied: trunk/dports/python/py-ipython/files/py27-ipython2 (from rev 139616, trunk/dports/python/py-ipython/files/ipython27) =================================================================== --- trunk/dports/python/py-ipython/files/py27-ipython2 (rev 0) +++ trunk/dports/python/py-ipython/files/py27-ipython2 2015-08-21 20:42:53 UTC (rev 139620) @@ -0,0 +1,3 @@ +${frameworks_dir}/Python.framework/Versions/2.7/bin/iptest2 +${frameworks_dir}/Python.framework/Versions/2.7/bin/ipython2 +${frameworks_dir}/Python.framework/Versions/2.7/share/man/man1/ipython.1 Copied: trunk/dports/python/py-ipython/files/py34-ipython (from rev 139619, trunk/dports/python/py-ipython/files/ipython34) =================================================================== --- trunk/dports/python/py-ipython/files/py34-ipython (rev 0) +++ trunk/dports/python/py-ipython/files/py34-ipython 2015-08-21 20:42:53 UTC (rev 139620) @@ -0,0 +1,3 @@ +${frameworks_dir}/Python.framework/Versions/3.4/bin/iptest +${frameworks_dir}/Python.framework/Versions/3.4/bin/ipython +${frameworks_dir}/Python.framework/Versions/3.4/share/man/man1/ipython.1 Copied: trunk/dports/python/py-ipython/files/py34-ipython3 (from rev 139616, trunk/dports/python/py-ipython/files/ipython34) =================================================================== --- trunk/dports/python/py-ipython/files/py34-ipython3 (rev 0) +++ trunk/dports/python/py-ipython/files/py34-ipython3 2015-08-21 20:42:53 UTC (rev 139620) @@ -0,0 +1,3 @@ +${frameworks_dir}/Python.framework/Versions/3.4/bin/iptest3 +${frameworks_dir}/Python.framework/Versions/3.4/bin/ipython3 +${frameworks_dir}/Python.framework/Versions/3.4/share/man/man1/ipython.1