Hi,
This diff updates ipython to the latest LTS release.
Tested on amd64.
For update need py-pathlib2 (on ports@)
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ipython/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 1 May 2017 15:37:15 -0000 1.44
+++ Makefile 24 Jun 2017 16:10:40 -0000
@@ -2,7 +2,7 @@
COMMENT= enhanced interactive Python shell
-MODPY_EGG_VERSION = 5.3.0
+MODPY_EGG_VERSION = 5.4.1
DISTNAME= ipython-${MODPY_EGG_VERSION}
CATEGORIES= devel
@@ -50,9 +50,10 @@ PORTHOME = ${WRKSRC}
.if ${FLAVOR:Mpython3}
PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-RUN_DEPENDS += math/py-numpy,python3
+TEST_DEPENDS += math/py-numpy${MODPY_FLAVOR}
.else
-RUN_DEPENDS += devel/py-backports-shutil-get-terminal-size
+RUN_DEPENDS += devel/py-backports-shutil-get-terminal-size \
+ devel/py-pathlib2
TEST_DEPENDS += devel/py-mock
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ipython/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 1 May 2017 15:37:15 -0000 1.20
+++ distinfo 24 Jun 2017 16:10:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (ipython-5.3.0.tar.gz) = v15hXn2W2sWmH7+Y2eKSbZiqVVgmgb6n6TgpkqP0PB0=
-SIZE (ipython-5.3.0.tar.gz) = 4967956
+SHA256 (ipython-5.4.1.tar.gz) = r6qSNDwgz0KWcoFhUh2E9gbYgX+WO+r3GY5j3+3ol/s=
+SIZE (ipython-5.4.1.tar.gz) = 4973571
Index: patches/patch-docs_autogen_shortcuts_py
===================================================================
RCS file: patches/patch-docs_autogen_shortcuts_py
diff -N patches/patch-docs_autogen_shortcuts_py
--- patches/patch-docs_autogen_shortcuts_py 13 Dec 2016 14:50:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-docs_autogen_shortcuts_py,v 1.1 2016/12/13 14:50:45 shadchin
Exp $
---- docs/autogen_shortcuts.py.orig Sat Aug 13 17:56:43 2016
-+++ docs/autogen_shortcuts.py Tue Oct 11 14:15:43 2016
-@@ -1,8 +1,8 @@
- from os.path import abspath, dirname, join
-
- from IPython.terminal.interactiveshell import KeyBindingManager
-+from IPython.utils import py3compat
-
--
- def name(c):
- s = c.__class__.__name__
- if s == '_Invert':
-@@ -60,7 +60,7 @@ for kb in ipy_bindings:
- if not doc or doc in dummy_docs:
- continue
-
-- shortcut = ' '.join([k if isinstance(k, str) else k.name for k in
kb.keys])
-+ shortcut = ' '.join([k if isinstance(k, py3compat.string_types) else
k.name for k in kb.keys])
- shortcut += shortcut.endswith('\\') and '\\' or ''
- if hasattr(kb.filter, 'filters'):
- flt = ' '.join(multi_filter_str(kb.filter))
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ipython/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- pkg/PLIST 13 Dec 2016 14:50:45 -0000 1.22
+++ pkg/PLIST 24 Jun 2017 16:10:40 -0000
@@ -520,6 +520,7 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}PyColorize.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_get_terminal_size.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}_process_posix.${MODPY_PYC_MAGIC_TAG}pyc
@@ -572,6 +573,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}warn.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/IPython/utils/${MODPY_PYCACHE}wildcard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/utils/_get_terminal_size.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_cli.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_common.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/_process_posix.py
@@ -1126,6 +1128,7 @@ share/examples/ipython${MODPY_BIN_SUFFIX
share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/Terminal Usage.ipynb
share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/Third Party Rich
Output.ipynb
share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/Trapezoid Rule.ipynb
+share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/Updating
Displays.ipynb
share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/Working With External
Code.ipynb
share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/data/
share/examples/ipython${MODPY_BIN_SUFFIX}/IPython Kernel/data/flare.json
