Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Dec 2024 16:01:58 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dd5985e25c23 - main - devel/py-thinc: Allow build with py-blis 1.1.0+
Message-ID:  <202412311601.4BVG1wJs089072@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

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

commit dd5985e25c23aefc9a7114f2d69c619210bca855
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-12-31 15:49:23 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-12-31 15:49:23 +0000

    devel/py-thinc: Allow build with py-blis 1.1.0+
    
    - Bump PORTREVISION for package change
---
 devel/py-thinc/Makefile                   |  5 +++--
 devel/py-thinc/files/patch-pyproject.toml |  8 +++++---
 devel/py-thinc/files/patch-setup.cfg      | 12 ++++++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/devel/py-thinc/Makefile b/devel/py-thinc/Makefile
index 4514f85b2074..62248117d1ea 100644
--- a/devel/py-thinc/Makefile
+++ b/devel/py-thinc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	thinc
 PORTVERSION=	9.1.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/explosion/thinc/releases/download/release-v${PORTVERSION}/
@@ -13,14 +14,14 @@ WWW=		https://thinc.ai/ \
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blis>=1.0.0<1.1.0:math/py-blis@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blis>=1.0.0<1.2.0:math/py-blis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}murmurhash>=0.28.0<1.1.0:devel/py-murmurhash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1<3.0.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}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blis>=1.0.0<1.1.0:math/py-blis@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blis>=1.0.0<1.2.0:math/py-blis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}catalogue>=2.0.4<2.1.0:devel/py-catalogue@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}confection>=0.0.1<1.0.0:devel/py-confection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cymem>=2.0.2<2.1.0:devel/py-cymem@${PY_FLAVOR} \
diff --git a/devel/py-thinc/files/patch-pyproject.toml b/devel/py-thinc/files/patch-pyproject.toml
index df635be76ba4..09580f80e1df 100644
--- a/devel/py-thinc/files/patch-pyproject.toml
+++ b/devel/py-thinc/files/patch-pyproject.toml
@@ -1,11 +1,13 @@
---- pyproject.toml.orig	2024-09-02 09:57:44 UTC
+--- pyproject.toml.orig	2024-09-12 19:54:11 UTC
 +++ pyproject.toml
-@@ -6,8 +6,8 @@ requires = [
+@@ -5,9 +5,9 @@ requires = [
+     "murmurhash>=1.0.2,<1.1.0",
      "cymem>=2.0.2,<2.1.0",
      "preshed>=3.0.2,<3.1.0",
-     "blis>=1.0.0,<1.1.0",
+-    "blis>=1.0.0,<1.1.0",
 -    "numpy>=2.0.0,<3.0.0; python_version < '3.9'",
 -    "numpy>=2.0.0,<3.0.0; python_version >= '3.9'",
++    "blis>=1.0.0,<1.2.0",
 +    "numpy>=0,<3.0.0; python_version < '3.9'",
 +    "numpy>=0,<3.0.0; python_version >= '3.9'",
  ]
diff --git a/devel/py-thinc/files/patch-setup.cfg b/devel/py-thinc/files/patch-setup.cfg
index 94cc684ce603..da75105f2277 100644
--- a/devel/py-thinc/files/patch-setup.cfg
+++ b/devel/py-thinc/files/patch-setup.cfg
@@ -1,6 +1,6 @@
---- setup.cfg.orig	2024-09-02 09:57:54 UTC
+--- setup.cfg.orig	2024-09-12 19:54:21 UTC
 +++ setup.cfg
-@@ -29,7 +29,7 @@ setup_requires = 
+@@ -29,13 +29,13 @@ setup_requires = 
  python_requires = >=3.9
  setup_requires = 
  	cython>=0.25,<3.0
@@ -9,6 +9,14 @@
  	cymem>=2.0.2,<2.1.0
  	preshed>=3.0.2,<3.1.0
  	murmurhash>=1.0.2,<1.1.0
+-	blis>=1.0.0,<1.1.0
++	blis>=1.0.0,<1.2.0
+ install_requires = 
+-	blis>=1.0.0,<1.1.0
++	blis>=1.0.0,<1.2.0
+ 	murmurhash>=1.0.2,<1.1.0
+ 	cymem>=2.0.2,<2.1.0
+ 	preshed>=3.0.2,<3.1.0
 @@ -44,7 +44,7 @@ install_requires = 
  	catalogue>=2.0.4,<2.1.0
  	confection>=0.0.1,<1.0.0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412311601.4BVG1wJs089072>