py-hypothesis: fix build for Python 3.7; avoid self-conflict; bump revision

4 files changed, 36 insertions, 6 deletions

diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index 70cf6e62a7f..2ff3905d5df 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.113 2022/11/03 10:43:03 adam Exp $
+# $NetBSD: Makefile,v 1.114 2022/11/04 18:34:09 adam Exp $
 #
 # Changelog: https://hypothesis.readthedocs.io/en/latest/changes.html
 
 DISTNAME=	hypothesis-6.56.4
+PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/hypothesis/}
@@ -19,13 +20,16 @@ USE_LANGUAGES=	# none
 
 USE_PKG_RESOURCES=	yes
 
-# https://github.com/HypothesisWorks/hypothesis/issues/3500
-PYTHON_VERSIONS_INCOMPATIBLE=	27 37
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} != 311
 DEPENDS+=	${PYPKGPREFIX}-exceptiongroup>=1.0.0:../../devel/py-exceptiongroup
 .endif
 
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} hypothesis hypothesis-${PYVERSSUFFIX} || ${TRUE}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-hypothesis/PLIST b/devel/py-hypothesis/PLIST
index bed948b021a..22a0cc05be1 100644
--- a/devel/py-hypothesis/PLIST
+++ b/devel/py-hypothesis/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.37 2022/10/25 09:08:45 adam Exp $
-bin/hypothesis
+@comment $NetBSD: PLIST,v 1.38 2022/11/04 18:34:09 adam Exp $
+bin/hypothesis-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/devel/py-hypothesis/distinfo b/devel/py-hypothesis/distinfo
index 295bc34bc64..1de894ecb4d 100644
--- a/devel/py-hypothesis/distinfo
+++ b/devel/py-hypothesis/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.109 2022/11/03 10:43:03 adam Exp $
+$NetBSD: distinfo,v 1.110 2022/11/04 18:34:09 adam Exp $
 
 BLAKE2s (hypothesis-6.56.4.tar.gz) = 34cc00172c0a88f85ea6699233c16af1e7b7b0ab1318ce91e109e789713a737d
 SHA512 (hypothesis-6.56.4.tar.gz) = 7ca2a1e677444f3073e3ebf8a4c39039636f92b51f28f4b296998a6d10cde3ff9321c0d9ee7ff6d5748f3cf4b196bbf795cb5f3e5bd78585b6dc34af5587fe97
 Size (hypothesis-6.56.4.tar.gz) = 333424 bytes
+SHA1 (patch-src_hypothesis_extra_array__api.py) = 788a333566cf2d8b800ad43e2b6583f31ff04597
diff --git a/devel/py-hypothesis/patches/patch-src_hypothesis_extra_array__api.py b/devel/py-hypothesis/patches/patch-src_hypothesis_extra_array__api.py
new file mode 100644
index 00000000000..cedcdc4e957
--- /dev/null
+++ b/devel/py-hypothesis/patches/patch-src_hypothesis_extra_array__api.py
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_hypothesis_extra_array__api.py,v 1.1 2022/11/04 18:34:09 adam Exp $
+
+Fix build for Python 3.7.
+https://github.com/HypothesisWorks/hypothesis/issues/3500
+
+--- src/hypothesis/extra/array_api.py.orig	2022-11-04 18:29:04.000000000 +0000
++++ src/hypothesis/extra/array_api.py
+@@ -902,7 +902,7 @@ def make_strategies_namespace(
+         check_argument(
+             isinstance(xp.__array_api_version__, str)
+             and xp.__array_api_version__ in RELEASED_VERSIONS,
+-            f"{xp.__array_api_version__=}, but xp.__array_api_version__ must "
++            f"{xp.__array_api_version__}, but xp.__array_api_version__ must "
+             f"be a valid version string {RELEASED_VERSIONS}. {not_available_msg}",
+         )
+         api_version = xp.__array_api_version__
+@@ -910,7 +910,7 @@ def make_strategies_namespace(
+     else:
+         check_argument(
+             isinstance(api_version, str) and api_version in NOMINAL_VERSIONS,
+-            f"{api_version=}, but api_version must be None, or a valid version "
++            f"{api_version}, but api_version must be None, or a valid version "
+             f"string {RELEASED_VERSIONS}. {not_available_msg}",
+         )
+         inferred_version = False