git: 9860d004d974 - main - textproc/py-spacy: Allow build with py-thinc8 8.3.0

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 04 Aug 2024 17:23:10 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9860d004d974cc61da5edb31a7bf02bdae59bde1

commit 9860d004d974cc61da5edb31a7bf02bdae59bde1
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-08-04 17:09:13 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-08-04 17:14:12 +0000

    textproc/py-spacy: Allow build with py-thinc8 8.3.0
    
    - Bump PORTREVISION for package change
---
 textproc/py-spacy/Makefile                   |  5 +++--
 textproc/py-spacy/files/patch-pyproject.toml | 11 +++++++++++
 textproc/py-spacy/files/patch-setup.cfg      | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/textproc/py-spacy/Makefile b/textproc/py-spacy/Makefile
index 4b871e6692be..902ee8b2e8f9 100644
--- a/textproc/py-spacy/Makefile
+++ b/textproc/py-spacy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	spacy
 PORTVERSION=	3.7.5
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.25.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}preshed3>=3.0.2<3.1.0:devel/py-preshed3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}thinc8>=8.2.2<8.3.0:devel/py-thinc8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}thinc8>=8.2.2<8.3.0_99:devel/py-thinc8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}catalogue>=2.0.6<2.1.0:devel/py-catalogue@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \
@@ -33,7 +34,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}catalogue>=2.0.6<2.1.0:devel/py-catalogue@${
 		${PYTHON_PKGNAMEPREFIX}spacy-legacy>=3.0.11<3.1.0:textproc/py-spacy-legacy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spacy-loggers>=1.0.0<2.0.0:textproc/py-spacy-loggers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}srsly>=2.4.3<3.0.0:devel/py-srsly@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}thinc8>=8.2.2<8.3.0:devel/py-thinc8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}thinc8>=8.2.2<8.3.0_99:devel/py-thinc8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.38.0<5.0.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typer>=0.3.0<1.0.0:devel/py-typer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wasabi>=0.9.1<1.2.0:textproc/py-wasabi@${PY_FLAVOR} \
diff --git a/textproc/py-spacy/files/patch-pyproject.toml b/textproc/py-spacy/files/patch-pyproject.toml
new file mode 100644
index 000000000000..21e39f677180
--- /dev/null
+++ b/textproc/py-spacy/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2024-06-04 21:26:36 UTC
++++ pyproject.toml
+@@ -5,7 +5,7 @@ requires = [
+     "cymem>=2.0.2,<2.1.0",
+     "preshed>=3.0.2,<3.1.0",
+     "murmurhash>=0.28.0,<1.1.0",
+-    "thinc>=8.2.2,<8.3.0",
++    "thinc>=8.2.2,<=8.3.0",
+     "numpy>=1.15.0; python_version < '3.9'",
+     "numpy>=1.25.0; python_version >= '3.9'",
+ ]
diff --git a/textproc/py-spacy/files/patch-setup.cfg b/textproc/py-spacy/files/patch-setup.cfg
new file mode 100644
index 000000000000..4ee91a8c5b0c
--- /dev/null
+++ b/textproc/py-spacy/files/patch-setup.cfg
@@ -0,0 +1,19 @@
+--- setup.cfg.orig	2024-06-04 21:27:44 UTC
++++ setup.cfg
+@@ -39,14 +39,14 @@ setup_requires = 
+ 	cymem>=2.0.2,<2.1.0
+ 	preshed>=3.0.2,<3.1.0
+ 	murmurhash>=0.28.0,<1.1.0
+-	thinc>=8.2.2,<8.3.0
++	thinc>=8.2.2,<=8.3.0
+ install_requires = 
+ 	spacy-legacy>=3.0.11,<3.1.0
+ 	spacy-loggers>=1.0.0,<2.0.0
+ 	murmurhash>=0.28.0,<1.1.0
+ 	cymem>=2.0.2,<2.1.0
+ 	preshed>=3.0.2,<3.1.0
+-	thinc>=8.2.2,<8.3.0
++	thinc>=8.2.2,<=8.3.0
+ 	wasabi>=0.9.1,<1.2.0
+ 	srsly>=2.4.3,<3.0.0
+ 	catalogue>=2.0.6,<2.1.0