From nobody Sun Dec 25 09:57:54 2022 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 4NfxDg06yvz1HSN2; Sun, 25 Dec 2022 09:57:55 +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 4NfxDf6nl7z3kdS; Sun, 25 Dec 2022 09:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671962275; 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=QLwy6OUq6APzAIyQc+DQdEfDMbDBFzrmvpJmDEq0TAw=; b=e1qGE5G2FRnIS27bkeEuITd66bs5DaJxnfAAhQjcTBu2ZwQWvawW2uCZ7zIab95g0fM/Xb AE98khhDbyL1vvpgSGYRKT2UqBKxHcnq8dwr9ZIoGBFKYtbuIc5P0M8otkFZOMIaId+z8v GLeq7g8jdQtbo71CpBdZXB7k98E2jQjA3ekEWSVSl7OV5jhpTvP8pPSxBRBYPipHVBtWoS GZ302GYdyvgoiTf3oJ2PETUCzkKsd3WypsQgK2Nlx+cHkvNd0tDkAuD2xlGF20W0G+aHu8 gRSJyIe8MZl5RxKHa570aDs3kvWi7A7KNfxlO4twrUXoy1i/l3NrqoLzsHWGvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671962275; 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=QLwy6OUq6APzAIyQc+DQdEfDMbDBFzrmvpJmDEq0TAw=; b=OwJv+TvwZ637z2ID3zqrygk9GzksR3kDuE1UMpqtTo9STNfG1mYJXXPzHr10ysDn0FeOQ+ gfpIx+OVpZUkkr7ss0t7c0D4y0BcY4SzJuC+QfjIuqhaF8a6x5B3vX5mrMRkNCF9lLUzjm 34zqX/Qk0ZxBtg8VRSq4Eg0k21l4crFoldZV4HSGAju431YGZPTj2TPNzGlLuu4qf57ZTj xeWz/8yVKm+060VU3WbrZgTRz/JDh3DgiWPFgpuvTfM8cl6flFlO8/B0g4iYyxrhmqSgfG Fhidj0fLQY8SKOAqfHw+B1ZDCcGc8JaZCKvo08yjH7Tl/9efrDJg3FvypXCN1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671962275; a=rsa-sha256; cv=none; b=Se3QJUiScZVr1DzSgHnFJ2ucPkGZngIaE0gex+TUnfK7Ac7qAjSITAGUw8QcRVA4atYP9h 4rAy7xLBgXYjl/eHuPG/jF7IPdclGOhk9sdOQtOGHG0d6x7GeeTCEDfDOhcXbT4LKZ9FHI c5yYM0+m5S1Rkpzw2Fu1h26nvZ8ErKMddnJL6LS5TNbsK6oyk03GdplZoJzD8GsubnUXX2 MDNYXHjaPPo7nQ0BsCD6RWT/M+2zo4P8Ndf8FsXBFhyoKOqv6JBPeZRODB79KKE9fYn4h9 R+knv/kHzTKzvA2zakrybJ/GaGgX+qLnLDbge9DrsWIKGz+AsOUjQGMpEeST2A== 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 4NfxDf5p0Nznq5; Sun, 25 Dec 2022 09:57:54 +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 2BP9vso6057495; Sun, 25 Dec 2022 09:57:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BP9vsG3057494; Sun, 25 Dec 2022 09:57:54 GMT (envelope-from git) Date: Sun, 25 Dec 2022 09:57:54 GMT Message-Id: <202212250957.2BP9vsG3057494@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: bae8d2a074c8 - main - science/py-dwave-samplers: Update 1.0.0.dev2 -> 1.0.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: bae8d2a074c899292e22e16347214f145f78d2e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=bae8d2a074c899292e22e16347214f145f78d2e0 commit bae8d2a074c899292e22e16347214f145f78d2e0 Author: Yuri Victorovich AuthorDate: 2022-12-25 07:26:44 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-25 09:57:39 +0000 science/py-dwave-samplers: Update 1.0.0.dev2 -> 1.0.0 Reported by: portscout --- science/py-dwave-samplers/Makefile | 10 +- science/py-dwave-samplers/distinfo | 6 +- .../py-dwave-samplers/files/patch-pyproject.toml | 6 +- science/py-dwave-samplers/pkg-plist | 105 +++++++++++++++++++++ 4 files changed, 118 insertions(+), 9 deletions(-) diff --git a/science/py-dwave-samplers/Makefile b/science/py-dwave-samplers/Makefile index c401fd5f29ae..8eb4e72c32eb 100644 --- a/science/py-dwave-samplers/Makefile +++ b/science/py-dwave-samplers/Makefile @@ -1,5 +1,5 @@ PORTNAME= dwave-samplers -DISTVERSION= 1.0.0.dev2 +DISTVERSION= 1.0.0 CATEGORIES= science python # quantum-computing PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,14 +10,14 @@ WWW= https://github.com/dwavesystems/dwave-samplers LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>0:science/py-dimod@${PY_FLAVOR} \ +PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dimod>=0.12.0:science/py-dimod@${PY_FLAVOR} \ ${PYNUMPY} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} USES= python:3.7+ -USE_PYTHON= distutils cython autoplist unittest +USE_PYTHON= distutils cython unittest USE_GITHUB= yes GH_ACCOUNT= dwavesystems @@ -35,6 +35,10 @@ post-install: ) # strip binaries @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/samplers -name "*${PYTHON_EXT_SUFFIX}.so" | ${XARGS} ${STRIP_CMD} + # remove conflicting __init__.py, see https://github.com/dwavesystems/dwave-system/issues/462 + @${RM} -r \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__init__.py \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/dwave/__pycache__ post-test: @${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example.py diff --git a/science/py-dwave-samplers/distinfo b/science/py-dwave-samplers/distinfo index 4214556163c7..e6304478dbb2 100644 --- a/science/py-dwave-samplers/distinfo +++ b/science/py-dwave-samplers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668489714 -SHA256 (dwavesystems-dwave-samplers-1.0.0.dev2_GH0.tar.gz) = e9f0e6b28c8837752259b45cbcbeed8852a024cde4cc0319a6bda79b082f9882 -SIZE (dwavesystems-dwave-samplers-1.0.0.dev2_GH0.tar.gz) = 140011 +TIMESTAMP = 1671952452 +SHA256 (dwavesystems-dwave-samplers-1.0.0_GH0.tar.gz) = d28df71dd653a825ac7edccaccd6b625bffab1169aca7f09b37418187c40ea71 +SIZE (dwavesystems-dwave-samplers-1.0.0_GH0.tar.gz) = 141764 diff --git a/science/py-dwave-samplers/files/patch-pyproject.toml b/science/py-dwave-samplers/files/patch-pyproject.toml index b61d1eb2f640..bd6206e88df1 100644 --- a/science/py-dwave-samplers/files/patch-pyproject.toml +++ b/science/py-dwave-samplers/files/patch-pyproject.toml @@ -1,13 +1,13 @@ ---- pyproject.toml.orig 2022-11-14 21:54:42 UTC +--- pyproject.toml.orig 2022-11-25 23:11:15 UTC +++ pyproject.toml @@ -3,9 +3,9 @@ requires = [ "setuptools>=46.4.0", # PEP-420 support, PEP-517/518 support, setup.cfg attr: support "wheel>=0.30.0", # limited python api support "cython>=0.29.24,<3.0", -- 'dimod==0.12.1', +- 'dimod==0.12.0', - 'numpy==1.19.0;python_version<"3.9"', # C API for numpy.random - 'oldest-supported-numpy;python_version>="3.9"', -+ 'dimod>=0.12.1', ++ 'dimod>=0.12.0', + 'numpy>=1.19.0;python_version<"3.9"', # C API for numpy.random + #'oldest-supported-numpy;python_version>="3.9"', ] diff --git a/science/py-dwave-samplers/pkg-plist b/science/py-dwave-samplers/pkg-plist new file mode 100644 index 000000000000..515ec9a250b2 --- /dev/null +++ b/science/py-dwave-samplers/pkg-plist @@ -0,0 +1,105 @@ +%%PYTHON_SITELIBDIR%%/dwave/samplers/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__pycache__/composite%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__pycache__/composite%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/composite.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/decl.pxd +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/descent.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/descent%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/descent.pyx +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/sampler.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/src/descent.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/greedy/src/descent.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/planar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/planar%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/__pycache__/util%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/planar.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/sampler.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/planar/util.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/cyrandom.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/cyrandom%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/cyrandom.pyx +%%PYTHON_SITELIBDIR%%/dwave/samplers/random/sampler.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/sampler.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/simulated_annealing.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/simulated_annealing%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/simulated_annealing.pyx +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/src/cpu_sa.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/sa/src/cpu_sa.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__pycache__/sampler%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/sampler.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/bqp.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/bqp.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/common.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/tabu_search.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/tabu_search.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/tabu_utils.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/src/tabu_utils.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/tabu.pxd +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/tabu_search.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/tabu_search%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/tabu_search.pyx +%%PYTHON_SITELIBDIR%%/dwave/samplers/tabu/utils.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/__init__.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/__pycache__/samplers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/__pycache__/samplers%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/orang.pxd +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/sample.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/sample%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/sample.pyx +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/samplers.py +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/solve.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/solve%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/solve.pyx +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/base.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/buckettree.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/combine.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/exception.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/graph.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/marginalizer.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/merger.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/operations/count.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/operations/dummy.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/operations/logsumprod.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/operations/min.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/orang.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/sample.hpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/solve.hpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/table.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/task.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/treedecomp.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/utils.hpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/src/include/varorder.h +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/utilities.cpp +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/utilities%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/dwave/samplers/tree/utilities.pyx