I would like to migrate shells/py-qtconsole to python3-only. Reason is
that py-qtconsole is currently blocking other updates.
py-qtconsole has one consumer (devel/spyder/spyder), which is already
python3-only.
OK?
diff --git Makefile Makefile
index ae4647d4c58..900ce72e16b 100644
--- Makefile
+++ Makefile
@@ -7,7 +7,7 @@ DISTNAME = qtconsole-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = shells
-REVISION = 2
+REVISION = 3
# BSD
PERMIT_PACKAGE = Yes
@@ -27,14 +27,7 @@ RUN_DEPENDS =
devel/ipython${MODPY_FLAVOR}>=5.1.0 \
TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS += devel/py-mock
-.endif
-
-post-install:
- mv ${PREFIX}/bin/jupyter-qtconsole{,${MODPY_BIN_SUFFIX}}
+FLAVOR = python3
do-test:
cd ${WRKSRC} && ${MODPY_BIN} -m unittest discover
diff --git pkg/PLIST pkg/PLIST
index ac3dc15eb65..25b7fa3b5fe 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2017/05/12 09:32:52 shadchin Exp $
-bin/jupyter-qtconsole${MODPY_BIN_SUFFIX}
+@conflict py-qtconsole-*
+@pkgpath shells/py-qtconsole
+bin/jupyter-qtconsole
lib/python${MODPY_VERSION}/site-packages/qtconsole/
lib/python${MODPY_VERSION}/site-packages/qtconsole-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/qtconsole/__init__.py