Upgrade to version 3.1.0.

3 files changed, 54 insertions, 28 deletions

diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index c69e26b1236c..db3c36bb98fa 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipython
-PORTVERSION=	2.3.0
+PORTVERSION=	3.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -38,7 +38,9 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-
 
 .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}
diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo
index f7bfc68e163d..6735fa440f4f 100644
--- a/devel/ipython/distinfo
+++ b/devel/ipython/distinfo
@@ -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
diff --git a/devel/ipython/pkg-plist b/devel/ipython/pkg-plist
index 01fb51d600f6..a3fb7cff620a 100644
--- a/devel/ipython/pkg-plist
+++ b/devel/ipython/pkg-plist
@@ -1,7 +1,3 @@
-%%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
@@ -13,10 +9,23 @@
 %%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
@@ -31,8 +40,10 @@
 %%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
@@ -43,31 +54,42 @@
 %%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
@@ -107,9 +129,11 @@
 %%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