From nobody Tue Oct 14 06:19:03 2025 X-Original-To: dev-commits-ports-all@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 4cm3vW38Dvz6BqDR; Tue, 14 Oct 2025 06:19:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cm3vW2Jl1z3YKm; Tue, 14 Oct 2025 06:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760422743; 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=l/V4oeN+N2wLTk+kjamv+7y25ioH92JfnT0Pgb6gj5Q=; b=Gij5bUjoUxEHf1vFxpfhkNN5YeTriP8SFg8IsYQpWus6vBNDHuN9Z7tXNAwS/08n9WdOuM vkySWBMQWOlN/HWNLWGnMyAgooSChgBaV+i5xmZyhPETKzIjyg3GAE1uTVUzT+oD+9/MBU W0gcJHhy2WUQ4kfoYrFRWowsbRuWn5d88MSJ7iE7SLmLKrPhHdF1iDyDFOMfN8MDcdTZa+ iLzCqVO9lTlPvE3Nv9pblWald/uKvyuTCK2F42xtdPI05ph3FhRiOLZ6izd+bhOe+9ImPZ Fajo9cEoFxYm6LaKQlhgSnuxCiYUZAzCll7y2xdmsLIUKxMNVzXbGgIc4ahoqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760422743; 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=l/V4oeN+N2wLTk+kjamv+7y25ioH92JfnT0Pgb6gj5Q=; b=cYs9EmmiqjpFxXeHrgGDfEkTexgI4wrY/ylV9v2CdEBjh/xVYTPbwveuqehV9QRM6JL40/ JWnybOv1R48Z9A0ruV25rLW1ErqpdQboVT0LmLpVplWgs9ZzVV6tV7LbplYMpwu6dttUKx uQw2C9zpCwa37n8HSoG5tlmh1IZPriPn59mvcf/YUaiTAVRfd+qm3GGBSKGKUOUNnR1mpa UXhKvoNAX6cS9QNxPrMJ1GAV2ezGesHEGpGBwSKdtD00/EAYClPKIAdVUxLb9KXPO1fHok TpzOUFiqaXqs4tzbeeirR9ROgJ1ukGl3BYmXgDgJc4tiE1mqRRKwmt/P0AWMjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760422743; a=rsa-sha256; cv=none; b=fQ2vD4rk7PU98xy6fSxPeE1CyQDBDTbwJOXl7G9gFg/DNvgiE79UdMg3nfV/+xwKuCBdy4 SrIfK9iBZHoJuBrciYT33NuZ9d+wJRn4blcLV3QGMdHkhQmygF0VJsFzuMp8nydXKjA3P6 5RP2nVsAhBUTZ5AMq3x+3Mp1mNIXu7Ib7Hxjgu43sqh26XaIDVMkWEB1wdZQOfmUvT0hK/ WS5ocW2SFyV9JqAtYu5JcX4T1mjyJyAS1XY5HoGFufuHdgqS3N/R0ElD373FtpjqzEB35E puO4owpdHRuW9YiHTUCWepKkqLOxmJKDWYvHTunYfE4IrJumCC7pZbhCB3j5Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cm3vW1tGlzhJp; Tue, 14 Oct 2025 06:19:03 +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 59E6J3uj026277; Tue, 14 Oct 2025 06:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59E6J3qj026274; Tue, 14 Oct 2025 06:19:03 GMT (envelope-from git) Date: Tue, 14 Oct 2025 06:19:03 GMT Message-Id: <202510140619.59E6J3qj026274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 1bcf545661ba - main - math/py-numpy: Revert "math/py-numpy: Migrate to PEP517" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bcf545661ba786deaae3052208465a4fddc6e33 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bcf545661ba786deaae3052208465a4fddc6e33 commit 1bcf545661ba786deaae3052208465a4fddc6e33 Author: Xin LI AuthorDate: 2025-10-14 05:42:16 +0000 Commit: Xin LI CommitDate: 2025-10-14 06:18:33 +0000 math/py-numpy: Revert "math/py-numpy: Migrate to PEP517" This reverts commit 3f582fcf38bb0cee40f9346683490aceb3bda654. The goal was to unblock package building ASAP while we investigate Requested by: antoine --- math/py-numpy/Makefile | 12 +++-------- math/py-numpy/files/patch-numpy_core_setup.py | 19 ------------------ .../patch-numpy_distutils_mingw32ccompiler.py | 17 ---------------- math/py-numpy/files/patch-numpy_random_setup.py | 23 ---------------------- math/py-numpy/files/patch-pyproject.toml | 11 ----------- 5 files changed, 3 insertions(+), 79 deletions(-) diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 5d51c1112175..22f8b33f9ed3 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -1,6 +1,6 @@ PORTNAME= numpy PORTVERSION= 1.26.4 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= PYPI \ @@ -18,14 +18,12 @@ WWW= https://www.numpy.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}meson-python>=0:devel/meson-python@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR} -USES= compiler:c11 cpe fortran pkgconfig python:3.9+ shebangfix -USE_PYTHON= allflavors autoplist concurrent cython pep517 +USES= compiler:c11 cpe fortran python:3.9+ +USE_PYTHON= allflavors autoplist concurrent cython distutils GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e \ s/libgfortran.so// @@ -63,10 +61,6 @@ OPENBLAS_VARS= BLASLIBS="openblas, gfortran" \ LIBRARIES=libraries SUITESPARSE_LIB_DEPENDS= libumfpack.so:math/suitesparse-umfpack -SHEBANG_FILES= numpy/f2py/crackfortran.py numpy/f2py/f2py2e.py \ - numpy/f2py/rules.py numpy/testing/print_coercion_tables.py \ - numpy/testing/setup.py - post-extract: @${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp @${TOUCH} ${WRKSRC}/numpy/random/_examples/temp diff --git a/math/py-numpy/files/patch-numpy_core_setup.py b/math/py-numpy/files/patch-numpy_core_setup.py deleted file mode 100644 index 7502a4df93fb..000000000000 --- a/math/py-numpy/files/patch-numpy_core_setup.py +++ /dev/null @@ -1,19 +0,0 @@ ---- numpy/core/setup.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/core/setup.py -@@ -9,7 +9,6 @@ from numpy.distutils import log - from os.path import join - - from numpy.distutils import log --from numpy.distutils.msvccompiler import lib_opts_if_msvc - from distutils.dep_util import newer - from sysconfig import get_config_var - from numpy.compat import npy_load_module -@@ -688,7 +687,7 @@ def configuration(parent_package='',top_path=None): - install_dir='lib', - build_info={ - 'include_dirs' : [], # empty list required for creating npy_math_internal.h -- 'extra_compiler_args': [lib_opts_if_msvc], -+ 'extra_compiler_args': [], - }) - config.add_npy_pkg_config("npymath.ini.in", "lib/npy-pkg-config", - subst_dict) diff --git a/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py b/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py deleted file mode 100644 index a7466a818792..000000000000 --- a/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py +++ /dev/null @@ -1,17 +0,0 @@ ---- numpy/distutils/mingw32ccompiler.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/distutils/mingw32ccompiler.py -@@ -24,7 +24,13 @@ from distutils.unixccompiler import UnixCCompiler - - import distutils.cygwinccompiler - from distutils.unixccompiler import UnixCCompiler --from distutils.msvccompiler import get_build_version as get_build_msvc_version -+ -+try: -+ from distutils.msvccompiler import get_build_version as get_build_msvc_version -+except ImportError: -+ def get_build_msvc_version(): -+ return None -+ - from distutils.errors import UnknownFileError - from numpy.distutils.misc_util import (msvc_runtime_library, - msvc_runtime_version, diff --git a/math/py-numpy/files/patch-numpy_random_setup.py b/math/py-numpy/files/patch-numpy_random_setup.py deleted file mode 100644 index 74ff5ffc8e54..000000000000 --- a/math/py-numpy/files/patch-numpy_random_setup.py +++ /dev/null @@ -1,23 +0,0 @@ ---- numpy/random/setup.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/random/setup.py -@@ -3,7 +3,6 @@ from numpy.distutils.system_info import platform_bits - from os.path import join - - from numpy.distutils.system_info import platform_bits --from numpy.distutils.msvccompiler import lib_opts_if_msvc - - - def configuration(parent_package='', top_path=None): -@@ -70,11 +69,7 @@ def configuration(parent_package='', top_path=None): - not initialized the distutils build command, so use this deferred - calculation to run when we are building the library. - """ -- opts = lib_opts_if_msvc(build_cmd) -- if build_cmd.compiler.compiler_type != 'msvc': -- # Some bit generators require c99 -- opts.append('-std=c99') -- return opts -+ return ['-std=c99'] - - config.add_installed_library('npyrandom', - sources=npyrandom_sources, diff --git a/math/py-numpy/files/patch-pyproject.toml b/math/py-numpy/files/patch-pyproject.toml deleted file mode 100644 index 3eb3c97a8da5..000000000000 --- a/math/py-numpy/files/patch-pyproject.toml +++ /dev/null @@ -1,11 +0,0 @@ ---- pyproject.toml.orig 2025-06-24 22:40:55 UTC -+++ pyproject.toml -@@ -2,7 +2,7 @@ requires = [ - build-backend = "mesonpy" - requires = [ - "Cython>=0.29.34,<3.1", -- "meson-python>=0.15.0,<0.16.0", -+ "meson-python>=0.15.0", - ] - - [project]