From nobody Mon May 27 00:22:55 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 4Vnbvh1v4wz5M8XT; Mon, 27 May 2024 00:22:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vnbvg6lLQz4gdm; Mon, 27 May 2024 00:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716769375; 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=GCQg49jkX4LqkHsA/lnQf70Tx5LzBhns37LGsBTZxAg=; b=U1KHaOEHL2JOgGz+5ZZnxGbBPoA7CyYMWPPMCUG+8cjB7p5WRxOJbzrFeq1+z8BhT6mAvE qvPIlcYDRrRS4luyysg7MwlPCuvq213oA4lcZQZJcgbPCxwjol++6qYkJxqcFcpBERAPQ1 y7yIwtnJ8Y1iMfNxU2aUKMdNoHaIeKZcl4CDizGkuk7AJ3N3RE7WyNdVYC5E7reFjtsiB3 e/wdPsaniYPSaHIKhRaY4PA/QWtS+P8zmW9w16kfwjwXkVGNYEFAtZG7QK0jPM2p0qGRjG HWhk3qAHIObKL2MRqHOfIqzhImRzLS7NpZ19VvL2txxmndDl8QsTza9NoZvBwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716769375; a=rsa-sha256; cv=none; b=wO4+GjHNkTCj4WJAf2dK38YbMENwxYhgF189q22eijSlmQP9Si8jB1lwOs76poATEsSGTy wP6rO94uX/fJdZSUd15O2QNZ7yeMmGeg3E/a8wimEZthSlRp7M8+1kD3OGv3A6lTNq5mf1 hp6iDjThQJSYNs1sK9YHK81l6eun7bB/aknf9Yryil+JcTpNHnzK6lfHxfQHKDV5N0juDh 9sCf5nUwrF4vCnSiYDrqssJPLcYWnM3+XiojMT2C9afpUvnWk9sa/o8FFCRNhATdTKp/6r dfgM3wuON0/vbpQCQyvPFGlU7OUhiggSlUJwULrHhTzFecXxAcwog42hfObUrg== 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=1716769375; 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=GCQg49jkX4LqkHsA/lnQf70Tx5LzBhns37LGsBTZxAg=; b=PQz0WwmQNYG6pIBolzYkZeOOYOISZZ++l8TRg+UrQbfBG9lb2qyQ2tgL7Ewq4QjtDUhlZZ l6xLxV/Xqo4eKgK5InLxRZtTLUSyvdWtG1jw+5YcG7Zx5AC8Anyk8gQ4bcmykIYz85YfRV AT7xngHX6J4uaKcsA60aiEgso5WhDaHOiDsb7NoWKe0gyW3ScHoLBhOZQoxroF2g2yv1Mt 64y3FbxfZ3/LcHAZjRiC00mnDSOiCQ5hd7KPHI872UKau37Fe0KzpnjEpxrfb3mT5QgLUl 8kdgLADXzceZAw7peEn7zCWywDRQSU7YS3eubHgCHkogwvdtEiXHb/xsGm9xrg== 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 4Vnbvg63z7zMXx; Mon, 27 May 2024 00:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44R0MtRc069547; Mon, 27 May 2024 00:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R0MtRf069544; Mon, 27 May 2024 00:22:55 GMT (envelope-from git) Date: Mon, 27 May 2024 00:22:55 GMT Message-Id: <202405270022.44R0MtRf069544@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 12e6720e986c - main - Revert "science/py-scipy: update 1.11.1 =?utf-8?Q?=E2=86=92?= 1.12.0" 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12e6720e986c30f17d929683d770ac883ad9b44b Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=12e6720e986c30f17d929683d770ac883ad9b44b commit 12e6720e986c30f17d929683d770ac883ad9b44b Author: Yuri Victorovich AuthorDate: 2024-05-27 00:21:37 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-27 00:22:42 +0000 Revert "science/py-scipy: update 1.11.1 → 1.12.0" This reverts commit 6b7a258af89199f12214268c416d69bae7453b80. --- science/py-scipy/Makefile | 49 ++++++++++------------ science/py-scipy/distinfo | 10 ++--- science/py-scipy/files/patch-scipy_linalg_setup.py | 11 +++++ 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile index 1488d6c09415..bc218dd1c8c4 100644 --- a/science/py-scipy/Makefile +++ b/science/py-scipy/Makefile @@ -1,5 +1,6 @@ PORTNAME= scipy -DISTVERSION= 1.12.0 +DISTVERSION= 1.11.1 +PORTEPOCH= 1 CATEGORIES= science python MASTER_SITES= https://docs.scipy.org/doc/${PORTNAME}-${DISTVERSION}/:doc \ PYPI:source \ @@ -17,48 +18,42 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pythran>=0:devel/py-pythran@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} + unzip>0:archivers/unzip +LIB_DEPENDS= libblas.so:math/blas \ + libopenblas.so:math/openblas RUN_DEPENDS= ${PYNUMPY} -#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}pooch>0:devel/py-pooch@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}scikit-umfpack>0:math/py-scikit-umfpack@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pooch>0:devel/py-pooch@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-umfpack>0:math/py-scikit-umfpack@${PY_FLAVOR} -USES= compiler:c++14-lang cpe fortran pkgconfig python:3.9-3.11 shebangfix -USE_PYTHON= autoplist concurrent cython pep517 +USES= compiler:c++14-lang cpe fortran python:3.9-3.11 shebangfix +USE_PYTHON= autoplist concurrent cython distutils FFLAGS+= -std=legacy +LDFLAGS+= -shared +PYDISTUTILS_BUILDARGS= --fcompiler=gnu95 +PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= BLASLIB -OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS -OPTIONS_DEFAULT= OPENBLAS - -ATLAS_USES= blaslapack:atlas -NETLIB_USES= blaslapack:netlib -OPENBLAS_USES= blaslapack:openblas - -post-patch: - @${REINPLACE_CMD} -e '23,26s|numpy==|numpy>=|' \ - ${WRKSRC}/pyproject.toml post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/scipy/ -name '*.so' | ${XARGS} ${STRIP_CMD} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${UNZIP_NATIVE_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip - @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo + @${UNZIP_CMD} -d ${STAGEDIR}${DOCSDIR} ${DISTDIR}/scipy-html-${DISTVERSION}.zip + @${RM} ${STAGEDIR}${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}/.buildinfo -#do-test: -# @cd ${WRKSRC} && ${TOUCH} .coveragerc && ${PYTHON_CMD} runtests.py +do-test: + @cd ${WRKSRC} && ${TOUCH} .coveragerc && ${PYTHON_CMD} runtests.py .include diff --git a/science/py-scipy/distinfo b/science/py-scipy/distinfo index 267c18d59a08..d48020edde76 100644 --- a/science/py-scipy/distinfo +++ b/science/py-scipy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1710836225 -SHA256 (scipy-1.12.0.tar.gz) = 4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3 -SIZE (scipy-1.12.0.tar.gz) = 56811768 -SHA256 (scipy-html-1.12.0.zip) = 8b8ee1758a6c6223f4b5f594eee2d09b9625c9a45077f2d044f4a8a8a9947381 -SIZE (scipy-html-1.12.0.zip) = 52137147 +TIMESTAMP = 1688646879 +SHA256 (scipy-1.11.1.tar.gz) = fb5b492fa035334fd249f0973cc79ecad8b09c604b42a127a677b45a9a3d4289 +SIZE (scipy-1.11.1.tar.gz) = 56031509 +SHA256 (scipy-html-1.11.1.zip) = e0a90d5fb0b93f0433c63cc1f80c8084e54c0402606a60a7898f61b53be60f13 +SIZE (scipy-html-1.11.1.zip) = 50389323 diff --git a/science/py-scipy/files/patch-scipy_linalg_setup.py b/science/py-scipy/files/patch-scipy_linalg_setup.py new file mode 100644 index 000000000000..c885d4d4a25f --- /dev/null +++ b/science/py-scipy/files/patch-scipy_linalg_setup.py @@ -0,0 +1,11 @@ +--- scipy/linalg/setup.py.orig 2022-08-08 07:24:08 UTC ++++ scipy/linalg/setup.py +@@ -160,7 +160,7 @@ def configuration(parent_package='', top_path=None): + + # Add any license files + config.add_data_files('src/id_dist/doc/doc.tex') +- config.add_data_files('src/lapack_deprecations/LICENSE') ++ #config.add_data_files('src/lapack_deprecations/LICENSE') + + # Type stubs + config.add_data_files('*.pyi')