Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.768
diff -u -p -r1.768 Makefile
--- Makefile 22 Jun 2019 18:23:34 -0000 1.768
+++ Makefile 26 Jun 2019 21:31:45 -0000
@@ -5,12 +5,12 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.160
+PKGNAME = quirks-3.161
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>
# BSD
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
PERLDIR = ${PREFIX}/libdata/perl5/site_perl
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.786
diff -u -p -r1.786 Quirks.pm
--- files/Quirks.pm 22 Jun 2019 18:23:34 -0000 1.786
+++ files/Quirks.pm 26 Jun 2019 21:31:46 -0000
@@ -1258,6 +1258,7 @@ my $obsolete_reason = {
'proxy-suite' => 3,
'py-amf' => 6,
'lam' => 3,
+ 'py3-typing' => 5,
};
# reasons for obsolete packages
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-typing/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 28 Apr 2019 20:51:38 -0000 1.7
+++ Makefile 27 Jun 2019 06:34:23 -0000
@@ -2,27 +2,25 @@
COMMENT = type hints for python
-MODPY_EGG_VERSION = 3.6.4
+MODPY_EGG_VERSION = 3.7.4
DISTNAME = typing-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = devel
# PSF
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-FLAVORS = python3
-FLAVOR ?=
+# No python3 flavor - package is a no-op for Python 3 versions we have
+
+pre-test:
+ ln -sf /usr/local/bin/python2 ${WRKDIR}/bin/python
-# python3 tests require py-flake8-* ports
-.if ! ${FLAVOR:Mpython3}
do-test:
cd ${WRKSRC} && ${MODPY_BIN} -m unittest discover python2
-.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-typing/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 27 Apr 2018 15:14:47 -0000 1.4
+++ distinfo 27 Jun 2019 06:34:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (typing-3.6.4.tar.gz) = 1ACpNEJUgDojaFM+RTOkIA0h63trcpwXO8OCAadNs/I=
-SIZE (typing-3.6.4.tar.gz) = 71347
+SHA256 (typing-3.7.4.tar.gz) = U3ZexPg6K3ICFHJ+MZYHh5/sSs3iLE+7VPomBOeeRM4=
+SIZE (typing-3.7.4.tar.gz) = 77413
Index: patches/patch-python2_test_typing_py
===================================================================
RCS file: patches/patch-python2_test_typing_py
diff -N patches/patch-python2_test_typing_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-python2_test_typing_py 27 Jun 2019 06:34:23 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Make this test use the correct python executable instead of the
+possibly non-existent python
+
+Index: python2/test_typing.py
+--- python2/test_typing.py.orig
++++ python2/test_typing.py
+@@ -1972,7 +1972,7 @@ class AllTests(BaseTestCase):
+ file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+ 'typing.py')
+ try:
+- subprocess.check_output('python -OO {}'.format(file_path),
++ subprocess.check_output('python2 -OO {}'.format(file_path),
+ stderr=subprocess.STDOUT,
+ shell=True)
+ except subprocess.CalledProcessError:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-typing/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 8 Mar 2018 15:08:50 -0000 1.3
+++ pkg/PLIST 27 Jun 2019 06:34:23 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2018/03/08 15:08:50 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}typing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/typing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/typing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/typing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/typing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/typing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/typing.py
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}typing.${MODPY_PYC_MAGIC_TAG}pyc
This is an update for py-typing to version 3.7.4 that also removes the
python3 flavor. The typing library backports typing functionality to
Python 2.x and early versions of Python 3.x. We don't have a version of
Python 3.x in ports that benefits from this. It is purely a no-op. I
have eliminated the dependency from python3 flavors of various ports
with py-dnspython being the last.
The patch fixes one test that tries running "python". Last time kn@
suggested making a symbolic link to ${WRKDIR}/bin instead, but I tried
that and the test still fails.
I'm also including a diff for quirks that notes the elimination of the
python3 flavor.
I tested all three consumers (py-dnspython, py-aiodns, and py-M2Crypto)
and all 3 pass their regression tests exactly the same before and after
(py-typing 3.6.4 versus 3.7.4). py-M2Crypto hangs during the tests, but
does that before the py-typing update.
--Kurt
No comments:
Post a Comment