Index: head/devel/ipython/Makefile =================================================================== --- head/devel/ipython/Makefile (revision 385158) +++ head/devel/ipython/Makefile (revision 385159) @@ -1,68 +1,70 @@ # Created by: Dryice Liu # $FreeBSD$ PORTNAME= ipython -PORTVERSION= 2.3.0 +PORTVERSION= 3.1.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Enhanced Interactive Python shell BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=2:${PORTSDIR}/misc/py-pexpect \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3 USES= python USE_PYTHON= autoplist distutils USE_GCC= yes # To be removed - Needed as a work-around for numpy, see PR ports/188114 OPTIONS_DEFINE= X11 HTML_NOTEBOOK ZMQ EXAMPLES OPTIONS_DEFAULT=X11 ZMQ .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= HTML_NOTEBOOK .endif HTML_NOTEBOOK_DESC= HTML notebook support ZMQ_DESC= ZMQ support (parallel computing, qt console, notebook) .include .if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments .endif .if ${PORT_OPTIONS:MHTML_NOTEBOOK} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:${PORTSDIR}/www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:${PORTSDIR}/devel/py-jsonschema \ + ${PYTHON_PKGNAMEPREFIX}mistune>=0:${PORTSDIR}/textproc/py-mistune .endif .if ${PORT_OPTIONS:MZMQ} || ${PORT_OPTIONS:MHTML_NOTEBOOK} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:${PORTSDIR}/net/py-pyzmq .endif post-install: .if ${PORT_OPTIONS:MEXAMPLES} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .endif @${ECHO_CMD} "/EASY-INSTALL" > ${WRKDIR}/ex.script @${ECHO_CMD} "a" >> ${WRKDIR}/ex.script @${ECHO_CMD} "import os" >> ${WRKDIR}/ex.script @${ECHO_CMD} "os.environ[\"LD_LIBRARY_PATH\"]=\"${_GCC_RUNTIME}\"" >> ${WRKDIR}/ex.script @${ECHO_CMD} "." >> ${WRKDIR}/ex.script @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script @for file in ${STAGEDIR}${PREFIX}/bin/*; do \ ex $${file} < ${WRKDIR}/ex.script > /dev/null; \ done .include .if ${PYTHON_VER} == "3.1" || ${PYTHON_VER} == "3.2" IGNORE= only Python versions 2.7, 3.3 and 3.4 are supported .endif .include Index: head/devel/ipython/distinfo =================================================================== --- head/devel/ipython/distinfo (revision 385158) +++ head/devel/ipython/distinfo (revision 385159) @@ -1,2 +1,2 @@ -SHA256 (ipython-2.3.0.tar.gz) = a2f81afe3eca5c8b2e8cf4ec35518fd007a39231770e67e6c2c4f9bd2b857aae -SIZE (ipython-2.3.0.tar.gz) = 11913980 +SHA256 (ipython-3.1.0.tar.gz) = 532092d3f06f82b1d8d1e5c37097eae19fcf025f8f6a4b670dd49c3c338d5624 +SIZE (ipython-3.1.0.tar.gz) = 10915828 Index: head/devel/ipython/pkg-plist =================================================================== --- head/devel/ipython/pkg-plist (revision 385158) +++ head/devel/ipython/pkg-plist (revision 385159) @@ -1,115 +1,139 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builtin Extensions/Cython Magics.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builtin Extensions/Index.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builtin Extensions/Octave Magic.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builtin Extensions/R Magics.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Customization/Index.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Customization/appconfig.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/Index.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/embed_class_long.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/embed_class_short.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/embed_function.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/inprocess_qtconsole.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/inprocess_terminal.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/internal_ipkernel.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/ipkernel_qtapp.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Embedding/ipkernel_wxapp.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Animations Using clear_output.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Background Jobs.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Beyond Plain Python.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Capturing Output.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Cell Magics.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Custom Display Logic.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Index.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Plotting in the Notebook.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Raw Input in the Notebook.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Rich Output.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Script Magics.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/SymPy.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Terminal Usage.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Third Party Rich Output.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Trapezoid Rule.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/Working With External Code.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/data/flare.json %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/example-demo.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-glut.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-gtk.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-gtk3.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-pyglet.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-qt.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-tk.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/gui/gui-wx.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/ipython-completion.bash %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/ipython-get-history.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/ipython-qtconsole.desktop %%PORTEXAMPLES%%%%EXAMPLESDIR%%/IPython Kernel/ipython.desktop %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Index.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Beat Frequencies.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Custom Widgets.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Custom Widget - Hello World.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Date Picker Widget.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Exploring Graphs.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Export As (nbconvert).html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Export As (nbconvert).ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Factoring.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/File Upload Widget.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Image Browser.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Image Processing.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Index.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Lorenz Differential Equations.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Nonblocking Console.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Using Interact.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Variable Inspector.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget Alignment.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget Basics.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget Events.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget Placement.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget Styles.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Animations Using clear_output.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Basic Output.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget List.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/Widget Styling.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/MultilanguageKernels.graffle +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/MultilanguageKernels.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/ParallelKernels.graffle +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/ParallelKernels.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/VizInteractCompute.graffle +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/VizInteractCompute.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/WidgetArch.graffle +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/WidgetArch.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/WidgetModelView.graffle +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Interactive Widgets/images/WidgetModelView.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Configuring the Notebook and Server.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Connecting with the Qt Console.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Custom Display Logic.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Display System.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Converting Notebooks With nbconvert.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Custom Keyboard Shortcuts.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Importing Notebooks.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Index.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Markdown Cells.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Plotting with Matplotlib.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Raw Input.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/JavaScript Notebook Extensions.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Notebook Basics.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Running Code.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/SymPy.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Trapezoid Rule.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Typesetting Math Using MathJax.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/User Interface.ipynb -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/animation.m4v +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Typesetting Equations.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Using nbconvert as a Library.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/What is the IPython Notebook.ipynb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/Working With Markdown Cells.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/command_mode.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/dashboard_files_tab.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/dashboard_files_tab_btns.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/dashboard_files_tab_new.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/dashboard_files_tab_run.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/dashboard_running_tab.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/edit_mode.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/menubar_toolbar.png -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/python_logo.svg +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/images/nbconvert_arch.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/nbpackage/__init__.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/nbpackage/mynotebook.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/nbpackage/nbs/__init__.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Notebook/nbpackage/nbs/other.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Data Publication API.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Index.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Monitoring an MPI Simulation - 1.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Monitoring an MPI Simulation - 2.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Monte Carlo Options.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Parallel Decorator and map.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Parallel Magics.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Using Dill.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/Using MPI with IPython Parallel.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/customresults.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/daVinci Word Count/pwordfreq.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/daVinci Word Count/wordfreq.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/dagdeps.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/dependencies.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/fetchparse.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/interengine/bintree.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/interengine/bintree_script.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/interengine/communicator.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/interengine/interengine.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/iopubwatcher.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/itermapresult.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/nwmerge.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/phistogram.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/pi/parallelpi.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/pi/pidigits.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/rmt/rmt.ipy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/rmt/rmt.ipynb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/rmt/rmtkernel.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/task_profiler.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/throughput.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/wave2D/RectPartitioner.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/wave2D/communicator.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/wave2D/parallelwave-mpi.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/wave2D/parallelwave.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/wave2D/wavesolver.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/workflow/client.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/workflow/job_wrapper.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Parallel Computing/workflow/wmanager.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/FrontendKernel.graffle/data.plist +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/FrontendKernel.graffle/image1.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/FrontendKernel.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/animation.m4v %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/ipython_logo.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/python_logo.svg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/utils/list_pyfiles.ipy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/utils/list_subdirs.ipy