From nobody Sat Mar 18 07:52:22 2023 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 4PdtWW0sftz3yGQf; Sat, 18 Mar 2023 07:52:23 +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 4PdtWV4Z4tz3ht8; Sat, 18 Mar 2023 07:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679125942; 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=gesp1ReZ7txpX80d/0uZ9SbDKezzD+MJeoRWk+MAbfw=; b=Xez0M2a1dR9q0zKf/Zqmxm4+U2mPrimpEEUjd9ILTmAYl7+fF01Ym5U2nRtFEdvPS3VvqB sVu1QpKdA8T6ykJ+9H6YKZgFqxOf9HUkY3gEsIiFVnZMrwX+V/IJyM6eHYzr5aUoWFyiK4 8cw+nfSgDWQJZuhEdBCxvwU26P96v06CabyGZnGhtTNwPn9iV/9SLMbvzycJStJPzUuXZr 6Z3JcLX3CpQhQsl5DqzXX7F5RYVkzsp1ibsEDICj3XTVtRoLF7qyWxi+7QFZJC6sVv0psb R7m3JODGQiR8l+xJ5+HcEs5TPSuI0+xNCW/31sIz7y5dlbsEWfvkiCarmkAoJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679125942; 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=gesp1ReZ7txpX80d/0uZ9SbDKezzD+MJeoRWk+MAbfw=; b=KCIGlDikvIBzpr8F/vUcjo1E8wyiEwK6UjuA+3LAcZEJjPO8abh1KtapDWS9Yrr6OuP2s/ PxB24YptmY0hqrm/dmtUPhdemOrYxznZUurG0zclCDInqpV7dejoQfbaTnCjbAhc4FUssh SpPtCV1zs9Ok2z7I89gWZLAuIU9GcBivC8VZl0nAd2Yy4fY7q4jR08F5JBo9vBJGwGhhaB K5AI/UEAw8cyx7Pqwtxac2A9PCrkHzpcqMxPMbhpUVh8pifTumB0oedr26W3+NxRG77Qzx Y74aHzOVSvJn73KL9izCLdyddFvVetbGrD74ZxGYCXFGwfMDP15M9E2tGFobYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679125942; a=rsa-sha256; cv=none; b=aaofdcjg9XTodyNecy4sf3MoWBEizb0UAl6q4DLxEqB/kagsfnW1tdKQDIhEJT5S7WcDjg 8TgGtWm2paqrgNdchJ1x5Iy4qRTp/Bar0rwCYtvjcrhtyV+Z1pK7bi6DcfdxCJPxG4x9wz XD0B7ktgyHRjwF0EcaloklTCGPjGwNTEo2DspgcRAzdEkN1SGPTEHGXU2IHtPIzjb2OGg2 7LiNUDoUtPZyMdFiRZF3w1+pyvhg6dijGvRsLQJIg6hHL2NZLivZk8tCTGJGiTixkldvua 7udySHpT8cYEN923J5qFLuG8M4pH+8sAig4PRW3+bm1/qqelcVuxb5WEDZhdmw== 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 4PdtWV3g30z10GY; Sat, 18 Mar 2023 07:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32I7qMhu085755; Sat, 18 Mar 2023 07:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32I7qML9085754; Sat, 18 Mar 2023 07:52:22 GMT (envelope-from git) Date: Sat, 18 Mar 2023 07:52:22 GMT Message-Id: <202303180752.32I7qML9085754@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: ca2c88179a97 - main - =?utf-8?Q?science/py-pyscf:=20Update=202.1.1=20=E2=86=92=202.2.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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: ca2c88179a97afee007ceb9673a7a77602c12af6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca2c88179a97afee007ceb9673a7a77602c12af6 commit ca2c88179a97afee007ceb9673a7a77602c12af6 Author: Yuri Victorovich AuthorDate: 2023-03-18 07:51:50 +0000 Commit: Yuri Victorovich CommitDate: 2023-03-18 07:52:18 +0000 science/py-pyscf: Update 2.1.1 → 2.2.0 Reported by: portscout --- science/py-pyscf/Makefile | 4 +- science/py-pyscf/distinfo | 6 +-- .../files/patch-pyscf_lib_dft_libxc__itrf.c | 56 ---------------------- .../py-pyscf/files/patch-pyscf_lib_gto_ft__ao.c | 13 ----- 4 files changed, 5 insertions(+), 74 deletions(-) diff --git a/science/py-pyscf/Makefile b/science/py-pyscf/Makefile index 15b617347fe5..fc3c35934d23 100644 --- a/science/py-pyscf/Makefile +++ b/science/py-pyscf/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyscf DISTVERSIONPREFIX= v -DISTVERSION= 2.1.1 +DISTVERSION= 2.2.0 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,7 +22,7 @@ LIB_DEPENDS= libcint.so:science/libcint \ libxcfun.so:science/xcfun RUN_DEPENDS= ${PY_DEPENDS} -USES= fortran blaslapack:openblas compiler:c++11-lang python +USES= fortran blaslapack:openblas compiler:c++11-lang python:3.6+ USE_PYTHON= distutils autoplist pytest # 3818 warnings, 57 errors in tests, see https://github.com/pyscf/pyscf/issues/1536 USE_GITHUB= yes diff --git a/science/py-pyscf/distinfo b/science/py-pyscf/distinfo index 5bff06f258b2..517392b307ea 100644 --- a/science/py-pyscf/distinfo +++ b/science/py-pyscf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670658450 -SHA256 (pyscf-pyscf-v2.1.1_GH0.tar.gz) = 814240aa73f57ba96aee8264e3914c09f96ebdce1e42784da4b5e9a474ecb280 -SIZE (pyscf-pyscf-v2.1.1_GH0.tar.gz) = 10896271 +TIMESTAMP = 1679117766 +SHA256 (pyscf-pyscf-v2.2.0_GH0.tar.gz) = c02deddbed7d1c8f175800eb6ce1bd445cf48c5399b7aefa1c2be3978ecaa023 +SIZE (pyscf-pyscf-v2.2.0_GH0.tar.gz) = 10955385 diff --git a/science/py-pyscf/files/patch-pyscf_lib_dft_libxc__itrf.c b/science/py-pyscf/files/patch-pyscf_lib_dft_libxc__itrf.c deleted file mode 100644 index dbcee618bce5..000000000000 --- a/science/py-pyscf/files/patch-pyscf_lib_dft_libxc__itrf.c +++ /dev/null @@ -1,56 +0,0 @@ ---- pyscf/lib/dft/libxc_itrf.c.orig 2022-09-03 00:05:50 UTC -+++ pyscf/lib/dft/libxc_itrf.c -@@ -453,7 +453,7 @@ int LIBXC_is_hybrid(int xc_id) - raise_error -1; - } - --#if XC_MAJOR_VERSION < 6 -+#if XC_MAJOR_VERSION <= 6 - switch(func.info->family) - { - #ifdef XC_FAMILY_HYB_LDA -@@ -483,7 +483,7 @@ double LIBXC_hybrid_coeff(int xc_id) - raise_error 0.0; - } - --#if XC_MAJOR_VERSION < 6 -+#if XC_MAJOR_VERSION <= 6 - switch(func.info->family) - { - #ifdef XC_FAMILY_HYB_LDA -@@ -530,7 +530,7 @@ void LIBXC_rsh_coeff(int xc_id, double *rsh_pars) { - rsh_pars[1] = 0.0; - rsh_pars[2] = 0.0; - --#if XC_MAJOR_VERSION < 6 -+#if XC_MAJOR_VERSION <= 6 - XC(hyb_cam_coef)(&func, &rsh_pars[0], &rsh_pars[1], &rsh_pars[2]); - #else - switch(xc_hyb_type(&func)) { -@@ -548,7 +548,7 @@ int LIBXC_is_cam_rsh(int xc_id) { - fprintf(stderr, "XC functional %d not found\n", xc_id); - raise_error -1; - } --#if XC_MAJOR_VERSION < 6 -+#if XC_MAJOR_VERSION <= 6 - int is_cam = func.info->flags & XC_FLAGS_HYB_CAM; - #else - int is_cam = (xc_hyb_type(&func) == XC_HYB_CAM); -@@ -793,7 +793,7 @@ void LIBXC_eval_xc(int nfn, int *fn_id, double *fac, d - // set the range-separated parameter - if (omega[i] != 0) { - // skip if func is not a RSH functional --#if XC_MAJOR_VERSION < 6 -+#if XC_MAJOR_VERSION <= 6 - if (func.cam_omega != 0) { - func.cam_omega = omega[i]; - } -@@ -805,7 +805,7 @@ void LIBXC_eval_xc(int nfn, int *fn_id, double *fac, d - // Recursively set the sub-functionals if they are RSH - // functionals - for (j = 0; j < func.n_func_aux; j++) { --#if XC_MAJOR_VERSION < 6 -+#if XC_MAJOR_VERSION <= 6 - if (func.func_aux[j]->cam_omega != 0) { - func.func_aux[j]->cam_omega = omega[i]; - } diff --git a/science/py-pyscf/files/patch-pyscf_lib_gto_ft__ao.c b/science/py-pyscf/files/patch-pyscf_lib_gto_ft__ao.c deleted file mode 100644 index 1d2f9c022ac4..000000000000 --- a/science/py-pyscf/files/patch-pyscf_lib_gto_ft__ao.c +++ /dev/null @@ -1,13 +0,0 @@ -- wprkaropund for compilation failure on armv7 -- #include for int8_t, see https://github.com/pyscf/pyscf/issues/1535 - ---- pyscf/lib/gto/ft_ao.c.orig 2022-12-10 07:40:03 UTC -+++ pyscf/lib/gto/ft_ao.c -@@ -44,6 +44,7 @@ - - #include - #include -+#include - #include - #include - #include