Re: update devel/py-curtsies (triggers drop py2 support for devel/bpython)
On Sun 22/03/2020 18:41, Paco Esteban wrote:
> Ping ?
>
> Diffs attached again for convenience.
Comments inline
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/py-curtsies/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 12 Jul 2019 20:45:47 - 1.9
> +++ Makefile 13 Mar 2020 14:32:06 -
> @@ -2,10 +2,9 @@
>
> COMMENT =curses-like terminal wrapper
>
> -MODPY_EGG_VERSION = 0.2.11
> +MODPY_EGG_VERSION = 0.3.1
> DISTNAME = curtsies-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> -REVISION = 1
> CATEGORIES = devel
>
> # MIT
> @@ -15,11 +14,16 @@ MODULES = lang/python
>
> MODPY_SETUPTOOLS = Yes
> MODPY_PI = Yes
> +MODPY_PYTEST = Yes
>
> FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS =devel/py-blessings${MODPY_FLAVOR} \
> devel/py-wcwidth${MODPY_FLAVOR}
> +
> +TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
> + devel/py-mock${MODPY_FLAVOR} \
> + devel/py-pyte${MODPY_FLAVOR}
I prefer to have dependencies sorted ^.
With the above OK bket@ for py-curtsies
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/bpython/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 22 Sep 2019 21:46:07 - 1.26
> +++ Makefile 15 Mar 2020 15:28:30 -
> @@ -5,6 +5,7 @@ COMMENT= fancy interface to the Python i
> MODPY_EGG_VERSION=0.18
> DISTNAME=bpython-${MODPY_EGG_VERSION}
> CATEGORIES= devel
> +REVISION = 0
>
> HOMEPAGE=https://bpython-interpreter.org/
> MAINTAINER= Brian Callahan
> @@ -19,11 +20,7 @@ MODULES= lang/python
> MODPY_SETUPTOOLS=Yes
>
> FLAVORS =python3
> -FLAVOR ?=
> -
> -.if ${FLAVOR:Mpython3}
> -PKGNAME =bpython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
'make install' results in a collision. Either set PKGNAME as above or
change the conflict marker (see below). Personally I prefer setting
PKGNAME.
> -.endif
> +FLAVOR = python3
>
> RUN_DEPENDS= devel/desktop-file-utils \
> devel/py-curtsies${MODPY_FLAVOR} \
> @@ -37,17 +34,5 @@ BUILD_DEPENDS= devel/py-babel${MODPY_FLA
>
> TEST_DEPENDS=devel/py-mock${MODPY_FLAVOR} \
> devel/py-twisted${MODPY_FLAVOR}
> -
> -# de-conflict flavors
> -post-install:
> -.for b in bpdb bpython bpython-curses bpython-urwid
> - mv ${PREFIX}/bin/$b{,${MODPY_BIN_SUFFIX}}
> -.endfor
> - mv ${PREFIX}/man/man1/bpython{,${MODPY_BIN_SUFFIX}}.1
> - mv ${PREFIX}/man/man5/bpython-config{,${MODPY_BIN_SUFFIX}}.5
> - mv
> ${PREFIX}/share/appinfo/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.appdata.xml
> - mv
> ${PREFIX}/share/applications/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.desktop
> - mv ${PREFIX}/share/pixmaps/bpython{,${MODPY_BIN_SUFFIX}}.png
> -
>
> .include
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/devel/bpython/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 9 Aug 2019 00:00:40 - 1.9
> +++ pkg/PLIST 15 Mar 2020 16:07:07 -
> @@ -1,8 +1,10 @@
> @comment $OpenBSD: PLIST,v 1.9 2019/08/09 00:00:40 bcallah Exp $
> -bin/bpdb${MODPY_BIN_SUFFIX}
> -bin/bpython${MODPY_BIN_SUFFIX}
> -bin/bpython-curses${MODPY_BIN_SUFFIX}
> -bin/bpython-urwid${MODPY_BIN_SUFFIX}
> +@conflict bpython-*
As explained above: either set PKGNAME or change the @conflict-marker to
bpython3-*.
My proposal is to let the MAINTAINER decide which is the better
solution.
BTW, the quirk you need to add to devel/quirks is dependent on the above:
- PKGNAME option: 'bpython' => 'bpython3'.
- Updated conflict-marker: 'bpython3' => 'bpython'
Re: update devel/py-curtsies (triggers drop py2 support for devel/bpython)
On Sun, Mar 22 2020, Paco Esteban wrote: > Ping ? > > Diffs attached again for convenience. > > On Sun, 15 Mar 2020, Paco Esteban wrote: > >> Hi ports@, >> >> This complements an update sent previously for devel/py-wcwidth. >> Here's an update for devel/py-curtsies to 0.3.1. You can see the >> changelog here: >> >> https://github.com/bpython/curtsies/blob/master/CHANGELOG.md >> >> All tests pass. >> >> I've enabled pytest for tests and dropped py2 support for this port. >> This triggers drop py2 support for its only consumer devel/bpython (also >> attached). Maintainer (bcallah@) is ok with it. Four test fail, same >> as before the update. Tested it lightly, so more eyes on it are >> welcome. ok jca@ (can be committed right now) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update devel/py-curtsies (triggers drop py2 support for devel/bpython)
Ping ?
Diffs attached again for convenience.
On Sun, 15 Mar 2020, Paco Esteban wrote:
> Hi ports@,
>
> This complements an update sent previously for devel/py-wcwidth.
> Here's an update for devel/py-curtsies to 0.3.1. You can see the
> changelog here:
>
> https://github.com/bpython/curtsies/blob/master/CHANGELOG.md
>
> All tests pass.
>
> I've enabled pytest for tests and dropped py2 support for this port.
> This triggers drop py2 support for its only consumer devel/bpython (also
> attached). Maintainer (bcallah@) is ok with it. Four test fail, same
> as before the update. Tested it lightly, so more eyes on it are
> welcome.
>
> Cheers,
>
> --
> Paco Esteban.
> 0x5818130B8A6DBC03
--
Paco Esteban.
0x5818130B8A6DBC03
Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-curtsies/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:45:47 - 1.9
+++ Makefile13 Mar 2020 14:32:06 -
@@ -2,10 +2,9 @@
COMMENT = curses-like terminal wrapper
-MODPY_EGG_VERSION =0.2.11
+MODPY_EGG_VERSION =0.3.1
DISTNAME = curtsies-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
# MIT
@@ -15,11 +14,16 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
+MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-blessings${MODPY_FLAVOR} \
devel/py-wcwidth${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
+ devel/py-pyte${MODPY_FLAVOR}
.include
Index: distinfo
===
RCS file: /home/cvs/ports/devel/py-curtsies/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo2 Nov 2016 22:38:09 - 1.2
+++ distinfo13 Mar 2020 14:08:27 -
@@ -1,2 +1,2 @@
-SHA256 (curtsies-0.2.11.tar.gz) = 7EY532VDV5RMIBq9DXkdnf06wnzk+Quhwpkarwevku4=
-SIZE (curtsies-0.2.11.tar.gz) = 46740
+SHA256 (curtsies-0.3.1.tar.gz) = sskTqBE8Q4LhoiFnnyM4E5sRKDnesWwA7oc+V6SzO9Q=
+SIZE (curtsies-0.3.1.tar.gz) = 47944
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-curtsies/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 17 Jun 2017 07:07:56 - 1.2
+++ pkg/PLIST 13 Mar 2020 14:34:07 -
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2017/06/17 07:07:56 jasper Exp $
+@conflict py-curtsies-*
+@pkgpath devel/py-curtsies
lib/python${MODPY_VERSION}/site-packages/curtsies/
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/curtsies-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: Makefile
===
RCS file: /home/cvs/ports/devel/bpython/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile22 Sep 2019 21:46:07 - 1.26
+++ Makefile15 Mar 2020 15:28:30 -
@@ -5,6 +5,7 @@ COMMENT=fancy interface to the Python i
MODPY_EGG_VERSION=0.18
DISTNAME= bpython-${MODPY_EGG_VERSION}
CATEGORIES=devel
+REVISION = 0
HOMEPAGE= https://bpython-interpreter.org/
MAINTAINER=Brian Callahan
@@ -19,11 +20,7 @@ MODULES= lang/python
MODPY_SETUPTOOLS=Yes
FLAVORS = python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-PKGNAME = bpython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-.endif
+FLAVOR = python3
RUN_DEPENDS= devel/desktop-file-utils \
devel/py-curtsies${MODPY_FLAVOR} \
@@ -37,17 +34,5 @@ BUILD_DEPENDS= devel/py-babel${MODPY_FLA
TEST_DEPENDS= devel/py-mock${MODPY_FLAVOR} \
devel/py-twisted${MODPY_FLAVOR}
-
-# de-conflict flavors
-post-install:
-.for b in bpdb bpython bpython-curses bpython-urwid
- mv ${PREFIX}/bin/$b{,${MODPY_BIN_SUFFIX}}
-.endfor
- mv ${PREFIX}/man/man1/bpython{,${MODPY_BIN_SUFFIX}}.1
- mv ${PREFIX}/man/man5/bpython-config{,${MODPY_BIN_SUFFIX}}.5
- mv
${PREFIX}/share/appinfo/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.appdata.xml
- mv
${PREFIX}/share/applications/org.bpython-interpreter.bpython{,${MODPY_BIN_SUFFIX}}.desktop
- mv ${PREFIX}/share/pixmaps/bpython{,${MODPY_BIN_SUFFIX}}.png
-
.include
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/bpython/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 9 Aug 2019 00:00:40 - 1.9
+++ pkg/PLIST 15 Mar 2020 16:07:07 -
@@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.9 2019/08/09 00:00:40
