Hi ports@,
This is an easy update of devel/py-wcwidth to its latest version 0.1.8
I tried to make it py3 only, so this triggers a series of diffs to make
that possible.
First, for devel/py-wcwidth itself: installs ok and all tests pass for
me on amd64.
About its consumers:
* graphics/termtosvg
* all tests pass
* net/toot
* all tests pass
* devel/py-curtsies
* updated and converted to py3 only (sent on separate email). All
tests pass.
* devel/py-prompt_toolkit
* also attached to this email. Just made py3 only and bumped
revison. All tests pass.
This also triggers the conversion of devel/ipython to py3 only.
Four tests fail, just as before.
Maintainer (edd@) has some doubts about this. Mainly if users
will be upset for this. Comments on this are appreciated.
comments ? ok ?
--
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/py-wcwidth/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 12 Jul 2019 20:45:55 -0000 1.7
+++ Makefile 13 Mar 2020 18:29:24 -0000
@@ -2,10 +2,9 @@
COMMENT= measures number of terminal column cells of wide-char
code
-MODPY_EGG_VERSION= 0.1.7
+MODPY_EGG_VERSION= 0.1.8
DISTNAME= wcwidth-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 1
CATEGORIES= devel
@@ -22,6 +21,6 @@ MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = wcwidth
FLAVORS= python3
-FLAVOR ?=
+FLAVOR = python3
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/py-wcwidth/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 29 Sep 2016 15:05:13 -0000 1.3
+++ distinfo 13 Mar 2020 18:30:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (wcwidth-0.1.7.tar.gz) = PfNzciJtbmPhseHtoVxZS8qYoi0zojgyqQmY+qlrxl4=
-SIZE (wcwidth-0.1.7.tar.gz) = 22884
+SHA256 (wcwidth-0.1.8.tar.gz) = 8os+imSD5dSef4lJrBp4MU50AzOuMFtLpd79PnT7N6g=
+SIZE (wcwidth-0.1.8.tar.gz) = 19957
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/py-wcwidth/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Jan 2016 08:13:29 -0000 1.1.1.1
+++ pkg/PLIST 13 Mar 2020 18:30:19 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/07 08:13:29 ajacoutot Exp $
+@conflict py-wcwidth-*
+@pkgpath devel/py-wcwidth
lib/python${MODPY_VERSION}/site-packages/wcwidth/
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/py-prompt_toolkit/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 2 Dec 2019 14:16:45 -0000 1.14
+++ Makefile 13 Mar 2020 18:45:31 -0000
@@ -9,6 +9,7 @@ MODPY_EGG_VERSION= 1.0.15
DISTNAME= prompt_toolkit-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
EPOCH= 1
+REVISION= 0
CATEGORIES= devel
@@ -29,6 +30,6 @@ RUN_DEPENDS= devel/py-six${MODPY_FLAVOR
textproc/py-pygments${MODPY_FLAVOR}
FLAVORS= python3
-FLAVOR ?=
+FLAVOR = python3
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/py-prompt_toolkit/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 2 Dec 2019 14:16:45 -0000 1.8
+++ pkg/PLIST 13 Mar 2020 18:56:49 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2019/12/02 14:16:45 bket Exp $
+@conflict py-prompt_toolkit-*
+@pkgpath devel/py-prompt_toolkit
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/ipython/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 24 Nov 2019 19:40:48 -0000 1.52
+++ Makefile 15 Mar 2020 16:15:14 -0000
@@ -3,7 +3,7 @@
COMMENT= enhanced interactive Python shell
MODPY_EGG_VERSION = 5.8.0
-REVISION = 2
+REVISION = 3
DISTNAME= ipython-${MODPY_EGG_VERSION}
CATEGORIES= devel
@@ -20,6 +20,7 @@ RUN_DEPENDS = devel/py-decorator${MODPY
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 +42,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.
@@ -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
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/ipython/pkg/PLIST,v
retrieving revision 1.24
diff -u -p -r1.24 PLIST
--- pkg/PLIST 31 Oct 2018 12:37:34 -0000 1.24
+++ pkg/PLIST 15 Mar 2020 16:18:56 -0000
@@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.24 2018/10/31 12:37:34 bket Exp $
-bin/iptest${MODPY_BIN_SUFFIX}
+@conflict ipython*
+@pkgpath devel/ipython
@comment bin/iptest2
-@comment bin/iptest3
-bin/ipython${MODPY_BIN_SUFFIX}
@comment bin/ipython2
+bin/iptest
+@comment bin/iptest3
+bin/ipython
@comment bin/ipython3
lib/python${MODPY_VERSION}/site-packages/IPython/
lib/python${MODPY_VERSION}/site-packages/IPython/__init__.py
@@ -665,6 +667,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/IPython/utils/warn.py
lib/python${MODPY_VERSION}/site-packages/IPython/utils/wildcard.py
lib/python${MODPY_VERSION}/site-packages/ipython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-@man man/man1/ipython${MODPY_BIN_SUFFIX}.1
-share/applications/ipython${MODPY_BIN_SUFFIX}.desktop
@tag update-desktop-database
+@man man/man1/ipython.1
+share/applications/ipython.desktop
