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
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 -0000 1.9
+++ Makefile 13 Mar 2020 14:32:06 -0000
@@ -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 <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/py-curtsies/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 2 Nov 2016 22:38:09 -0000 1.2
+++ distinfo 13 Mar 2020 14:08:27 -0000
@@ -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 -0000 1.2
+++ pkg/PLIST 13 Mar 2020 14:34:07 -0000
@@ -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
--- Makefile 22 Sep 2019 21:46:07 -0000 1.26
+++ Makefile 15 Mar 2020 15:28:30 -0000
@@ -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 <bcal...@openbsd.org>
@@ -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 <bsd.port.mk>
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 -0000 1.9
+++ pkg/PLIST 15 Mar 2020 16:07:07 -0000
@@ -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-*
+@pkgpath devel/bpython
+bin/bpdb
+bin/bpython
+bin/bpython-curses
+bin/bpython-urwid
lib/python${MODPY_VERSION}/site-packages/bpdb/
lib/python${MODPY_VERSION}/site-packages/bpdb/__init__.py
lib/python${MODPY_VERSION}/site-packages/bpdb/__main__.py
@@ -180,11 +182,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/bpython/translations/nl_NL/LC_MESSAGES/
lib/python${MODPY_VERSION}/site-packages/bpython/translations/nl_NL/LC_MESSAGES/bpython.mo
lib/python${MODPY_VERSION}/site-packages/bpython/urwid.py
-@man man/man1/bpython${MODPY_BIN_SUFFIX}.1
-@man man/man5/bpython-config${MODPY_BIN_SUFFIX}.5
+@man man/man1/bpython.1
+@man man/man5/bpython-config.5
share/appinfo/
-share/appinfo/org.bpython-interpreter.bpython${MODPY_BIN_SUFFIX}.appdata.xml
-share/applications/org.bpython-interpreter.bpython${MODPY_BIN_SUFFIX}.desktop
+share/appinfo/org.bpython-interpreter.bpython.appdata.xml
+share/applications/org.bpython-interpreter.bpython.desktop
share/pixmaps/
-share/pixmaps/bpython${MODPY_BIN_SUFFIX}.png
@tag update-desktop-database
+share/pixmaps/bpython.png
