From nobody Sun Sep 22 08:53:40 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XBKfX6NPzz5Vb1D; Sun, 22 Sep 2024 08:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XBKfX4fBJz4JFL; Sun, 22 Sep 2024 08:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726995220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CteMiU/4sw2ZCKmFT9f3hDy0VYEEV3SebR075gzJCE=; b=ugq8R0vJgQSUU8g3aLobzWX5sS/DARWMKr8ZQrKWUiiHOOVEsZ4hXjbkAL2LxDW0DLDpQ1 MDSu1l8G1fYRG68EHsTEW+T2VHxGFUdjgfZCO53rneFXtsN09gikjQOoSNNKRoEfDODv+t j+JxJEUu30D/H+9A2FxFYmCi33omJ1lDzbBRTjZcL8qlEX8m+fto6KrDXah/E9lx3N6PsG NDkYNG/OW0jTtI3492xUWk2M9foyWE136l8VPphcv7AtOc7kXfyc1irN6REdo5QviV5EO7 CUmDHA5MmVMJqZCogqbCsu5fvCgQk1D+CbMAAZlyUOLwV+w6SH8dakxJ2iQ2FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726995220; a=rsa-sha256; cv=none; b=i7BHSQ8GooKL8AVmmjR16vZabRqjtj8tQyzYv8IBd5ueDO11jUGJjaVZTyWkoWZpuzlRQt ONnelHPS9UuCWrZzx6MzFUT2rtoHUtS41gYPccfApawAcPRlPDKAhTxY6sr9CM8T2eWMdi 6ReUdWFoc3mlGN8f3poGTwuishNCRcSK9zeQtfLA91k9+3Jvw6L1DeRZtRLtD+EC12uWjA B4zE9IU1a97XdQuOgczpTnE8kMl95b8C0mE7VTKf+fEjOB01QtW5ELD/CKCwLRWQswxWb6 TwZfYw5rVK8K1D2Ug4sA0kx5Ktc7P7LjmgufOgEFGPNQn5IztgJOx3c3kC7rbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726995220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CteMiU/4sw2ZCKmFT9f3hDy0VYEEV3SebR075gzJCE=; b=FFlEsSyVx1UFp0hN1LDuDcdsi2F9ZztmGJy8+vANfx6VVmlCvbJtMt0SeQYnPqaHIRUoSh f4k915B4yLbae7Aelly4dHYOOrhZcDfGT98FDbBiNXauhByTwSqduxSzbfiL6A3qp3L6/n OiUpuHgc10VICiuTpgLZ9mfw+KcI58LP5fZ/WmZPBneMBrqmcRb2zIWVrWDQNyD93VrSOa 3h7gLKL/49icf7h2F0vwppuPPrInjBH05dLWHYSqY8Z5e2Kf/xM8P0TzzcX1r7r2qOcZNt pCqWmBdeePqAOYlbszbs3pFLIh/9yBMFpATJinMU27h+P3ApbwpBDIQMDX1F+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XBKfX4Cfmz195b; Sun, 22 Sep 2024 08:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48M8rev0031826; Sun, 22 Sep 2024 08:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48M8re7i031823; Sun, 22 Sep 2024 08:53:40 GMT (envelope-from git) Date: Sun, 22 Sep 2024 08:53:40 GMT Message-Id: <202409220853.48M8re7i031823@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 4a7348fd86ee - main - graphics/py-scikit-image: convert to pep517 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a7348fd86ee5ee6f02e474c8a8a25222ae91b6f Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a7348fd86ee5ee6f02e474c8a8a25222ae91b6f commit 4a7348fd86ee5ee6f02e474c8a8a25222ae91b6f Author: Max Brazhnikov AuthorDate: 2024-09-22 08:52:05 +0000 Commit: Max Brazhnikov CommitDate: 2024-09-22 08:52:05 +0000 graphics/py-scikit-image: convert to pep517 --- graphics/py-scikit-image/Makefile | 16 +++------ .../py-scikit-image/files/patch-pyproject.toml | 42 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index 5fc93825aa9b..7508f070e973 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -1,7 +1,7 @@ PORTNAME= scikit-image PORTVERSION= 0.19.3 -PORTREVISION= 3 DISTVERSIONPREFIX= v +PORTREVISION= 3 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pythran>0:devel/py-pythran@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}imageio>=2.4.1:graphics/py-imageio@${PY_FLAVOR} \ @@ -27,19 +29,11 @@ RUN_DEPENDS= ${PYNUMPY} \ USES= compiler:c++11-lang python shebangfix USE_GITHUB= yes -USE_PYTHON= autoplist concurrent distutils cython cython_run +USE_PYTHON= autoplist concurrent cython cython_run pep517 -PYDISTUTILS_BUILD_TARGET= build build_ext -PYDISTUTILS_BUILDARGS+= saveopts SHEBANG_FILES= skimage/scripts/skivi post-install: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \; -do-test: - @cd ${WRKSRC} && \ - ${PYTHON_CMD} ${PYSETUP} build_ext -i && \ - ${PYTHON_CMD} selftest.py && \ - ${PYTHON_CMD} -m nose -vx Tests/test_*.py - .include diff --git a/graphics/py-scikit-image/files/patch-pyproject.toml b/graphics/py-scikit-image/files/patch-pyproject.toml new file mode 100644 index 000000000000..018f5fbe0a7d --- /dev/null +++ b/graphics/py-scikit-image/files/patch-pyproject.toml @@ -0,0 +1,42 @@ +--- pyproject.toml.orig 2022-06-12 15:28:34 UTC ++++ pyproject.toml +@@ -1,37 +1,10 @@ requires = [ + [build-system] + requires = [ + "wheel", +- "setuptools<=59.4", ++ "setuptools", + "packaging", + "Cython>=0.29.24,<3.0", + "pythran", + +- # We follow scipy for much of these pinnings +- # https://github.com/scipy/scipy/blob/master/pyproject.toml +- # numpy 1.19 was the first minor release to provide aarch64 wheels, but +- # wheels require fixes contained in numpy 1.19.2 +- "numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64'", +- "numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64'", +- # aarch64 for py39 and py310 are covered by the default requirement below +- +- # arm64 on Darwin supports Python 3.8 and above requires numpy>=1.20.0 +- "numpy==1.20.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'", +- "numpy==1.20.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'", +- # arm64 for py310 is covered by the default requirement below +- +- # default numpy requirements +- "numpy==1.17.3; python_version=='3.7' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64' and platform_python_implementation != 'PyPy'", +- "numpy==1.17.3; python_version=='3.8' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_machine!='aarch64' and platform_python_implementation != 'PyPy'", +- "numpy==1.19.3; python_version=='3.9' and (platform_machine!='arm64' or platform_system!='Darwin') and platform_python_implementation != 'PyPy'", +- "numpy==1.21.4; python_version=='3.10' and platform_python_implementation != 'PyPy'", +- +- # First PyPy versions for which there are numpy wheels +- "numpy==1.20.0; python_version=='3.7' and platform_python_implementation=='PyPy'", +- +- # For Python versions which aren't yet officially supported, +- # we specify an unpinned NumPy which allows source distributions +- # to be used and allows wheels to be used as soon as they +- # become available. +- "numpy; python_version>='3.11'", +- "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'", ++ "numpy", + ]