From e690a3d4cfc5b9dbcc4203f3e094862fb83b578b Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Sun, 31 Mar 2024 11:06:52 +0800 Subject: [PATCH] devel/py-xarray: Update version requirement of BUILD_DEPENDS - Remove PY_SETUPTOOLS: py-setuptools should be used rather than PY_SETUPTOOLS --- devel/py-xarray/Makefile | 4 ++-- devel/py-xarray/files/patch-pyproject.toml | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 devel/py-xarray/files/patch-pyproject.toml diff --git a/devel/py-xarray/Makefile b/devel/py-xarray/Makefile index a0b1a58a0b825..30e11d963da75 100644 --- a/devel/py-xarray/Makefile +++ b/devel/py-xarray/Makefile @@ -12,8 +12,8 @@ WWW= https://xarray.dev/ \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6:devel/py-setuptools-scm@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.22,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ diff --git a/devel/py-xarray/files/patch-pyproject.toml b/devel/py-xarray/files/patch-pyproject.toml deleted file mode 100644 index c1c17fb35e348..0000000000000 --- a/devel/py-xarray/files/patch-pyproject.toml +++ /dev/null @@ -1,11 +0,0 @@ ---- pyproject.toml.orig 2023-11-17 21:39:20 UTC -+++ pyproject.toml -@@ -48,7 +48,7 @@ viz = ["matplotlib", "seaborn", "nc-time-axis"] - build-backend = "setuptools.build_meta" - requires = [ - "setuptools>=42", -- "setuptools-scm>=7", -+ "setuptools-scm>=6", - ] - - [tool.setuptools]