Hi Bjorn,
I'm testing all the ports and consumers now.
Just a note inline.
On Wed, 18 Mar 2020, Bjorn Ketelaars wrote:
> diff --git devel/ipython/Makefile devel/ipython/Makefile
> index 18f71bf9154..03029eb6934 100644
> --- devel/ipython/Makefile
> +++ devel/ipython/Makefile
> @@ -3,8 +3,9 @@
> COMMENT= enhanced interactive Python shell
>
> MODPY_EGG_VERSION = 5.8.0
> -REVISION = 2
> +REVISION = 3
> DISTNAME= ipython-${MODPY_EGG_VERSION}
> +PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
> CATEGORIES= devel
>
> HOMEPAGE= https://ipython.org/
> @@ -20,6 +21,7 @@ RUN_DEPENDS =
> devel/py-decorator${MODPY_FLAVOR} \
> devel/desktop-file-utils \
> devel/py-pexpect${MODPY_FLAVOR} \
> devel/py-prompt_toolkit${MODPY_FLAVOR} \
> + math/py-numpy${MODPY_FLAVOR} \
> textproc/py-pygments${MODPY_FLAVOR}
>
> # Note that if you have pdb++ installed, tests will fail.
> @@ -41,16 +43,7 @@ PERMIT_PACKAGE= Yes
> MODPY_PI = Yes
>
> FLAVORS = python3
> -FLAVOR ?=
> -
> -.if ${FLAVOR:Mpython3}
> -PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
> -RUN_DEPENDS += math/py-numpy,python3
> -.else
> -RUN_DEPENDS += devel/py-backports-shutil-get-terminal-size \
> - devel/py-pathlib2
> -TEST_DEPENDS += devel/py-mock
> -.endif
> +FLAVOR = python3
>
> # Despite the fact that setupbase.py defines paths for examples to
> # be installed into, we still have to do it manually for some reason.
The diff I sent for devel/ipython also removed the renaming of the
binaries (so there's no more ipython-3, but ipython and all that).
Should we do that ?
Or leave it with the "-3" suffix ?
# Despite the fact that setupbase.py defines paths for examples to
# be installed into, we still have to do it manually for some reason.
@@ -62,11 +54,7 @@ post-install:
chown -R ${SHAREOWN}:${SHAREGRP} \
${WRKSRC}/examples/IPython\ Kernel/ipython.desktop
mv ${WRKSRC}/examples/IPython\ Kernel/ipython.desktop \
- ${APPS_DIR}/ipython${MODPY_BIN_SUFFIX}.desktop
-
- mv ${PREFIX}/bin/ipython ${PREFIX}/bin/ipython${MODPY_BIN_SUFFIX}
- mv ${PREFIX}/bin/iptest ${PREFIX}/bin/iptest${MODPY_BIN_SUFFIX}
- mv ${PREFIX}/man/man1/ipython.1
${PREFIX}/man/man1/ipython${MODPY_BIN_SUFFIX}.1
+ ${APPS_DIR}/ipython.desktop
pre-build:
${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
@@ -74,6 +62,6 @@ pre-build:
do-test:
env LC_CTYPE=en_US.UTF-8 PYTHONNOUSERSITE=1 \
- ${LOCALBASE}/bin/iptest${MODPY_BIN_SUFFIX}
+ ${LOCALBASE}/bin/iptest
> diff --git devel/ipython/pkg/PLIST devel/ipython/pkg/PLIST
> index 4146be3c30e..c5c48c97f01 100644
> --- devel/ipython/pkg/PLIST
> +++ devel/ipython/pkg/PLIST
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.24 2018/10/31 12:37:34 bket Exp $
> +@conflict ipython-*
> +@pkgpath devel/ipython
> bin/iptest${MODPY_BIN_SUFFIX}
> @comment bin/iptest2
> @comment bin/iptest3
--
Paco Esteban.
0x5818130B8A6DBC03
