Ping ?

(This needs bket's diff discussed on another thread:
https://marc.info/?l=openbsd-ports&m=158464110714289&w=2)

Find attached the (still relevant) parts for convenience.

On Sun, 15 Mar 2020, Bjorn Ketelaars wrote:

> On Sun 15/03/2020 17:52, Paco Esteban wrote:
> > On Sun, 15 Mar 2020, Paco Esteban wrote:
> > 
> > > * 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.
> > 
> > I just realized that devel/ipython has A METRIC TON of consumers ... not
> > sure how they slept under my radar, sorry.
> 
> I'm trying to push several tools from jupyter forward, several of which
> depend on ipython. If I'm not mistaken there are 3 more pieces needed
> before it is possible to migrate ipython to py3-only:
> 
> - rpointel@ sent a diff to ports@ for plaso and all of its dependencies,
>   which still needs testing:
>   https://marc.info/?l=openbsd-ports&m=158368639815369&w=2
> - I sent a diff to port@ for devel/py-nbconvert (update and migration to
>   py3-only): https://marc.info/?l=openbsd-ports&m=158351871906886&w=2
> 
> After the above has been committed we need to migrate several ports to
> py3-only at the same time. I have a diff sitting in my tree for this:
> 
> PORT                  CONSUMER(S)
> py-traitlets          ipython py-ipykernel py-jupyter_client py-jupyter_core 
> py-nbformat
> ipython                       py-ipykernel py-jupyter_client py-nbformat 
> py-traitlets
> py-ipykernel          ipython py-jupyter_client py-jupyter_core
> py-jupyter_core               py-jupyter_client py-nbformat
> py-jupyter_client     py-ipykernel
> py-nbformat           ipython
> 

-- 
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

Reply via email to