From nobody Thu Jan 11 05:09:44 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 4T9Xlr6vwPz56RYZ; Thu, 11 Jan 2024 05:09:44 +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 4T9Xlr5l9hz44Qx; Thu, 11 Jan 2024 05:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704949784; 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=MZN+KgZ+1Xp8BKJJCLqi2IxQqBgzBaeokY5yRGRfOKA=; b=P93oeR1VbHU0F0eFEQO74u3eScgzUcrs6Acr5CWOI336UFTXfq2JgARgTgb6ayCSXEMdRL BLtpTuo5UT0JCqBt28jPejIStnePJVwCrhh6cyFKt9TaR350HE/QW0reCmuWpCNbyKApiB NSpN5fyi288exn8HwlTvx3Rh6yDRcV71Mv8Sy/JMGSmcGLhlG/+VzDQO0WjeMn37XcNKPe YFwwlT9TszRfd2dKpLaUjnlU8LORikhCXuPl2AveuE6NQojh/bap7BojZgNmmHzdFDc2Xa fsa+Pe6e4kvGjom7l32r+S8cqHa0zmdb++B7ZrRitF7r1J0gvGk42BP3u0yWCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704949784; 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=MZN+KgZ+1Xp8BKJJCLqi2IxQqBgzBaeokY5yRGRfOKA=; b=r5NBQP12j/oKZAruzpgB+0kFtUGuI+v8DJJs3Jzt4ZML7mqXfDLDYhgIDrYtSNnp9Q9A3v XE4CBHhNGUCl5tqBlrolbkJA/qVwujAO9p8RA3uX5xTeQ0ZdNlbhAgFcc9IUdOtQeq3v2R 5w7GEAdyNKjE4ntNzpn3uodRxbsX8sfpEWMe652xurmEgXiGOtiA0po74g0r0dDgEf7LF8 NBugV3PA4NBW4thzporwdSTB8gS+D5RrTTzGyKpVKakN2E2Kk+9dA+FqB5su9iQcRSn837 jpVwUkBn51e+X8WDSFJLU9rCgaFUu3xM9M/x4Nxp/2Ljx1m+YTSEONwUHxSwqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704949784; a=rsa-sha256; cv=none; b=HyW4LVHe/2V/zxowM8tx82H+HccqMiL2luGoIfcxt+bH67rDRhw8ZZQtEuqehLLWDyxPq2 v7/OKlKNEgxsBKjlOnqqjfd7hg1Dx0AZNbZl1qw9W9nqa/9QzfECrpNOnIAhhBkv6S2KK3 7aJ/OHRTm88aCRym7rL0ujwp6QIlannU3jsZjbA7IjBiohl7ELTAKKQ+Idx2bhAMeh0gOJ dGRxydXtJxk7SrIBlVdxiwWMKZQCyzqBF3n98khvAGdfYX0KGH2yIFQIslmZa0iwizIWqU EnqX2JCSC/NoQ4acjVsS61KJqE20f2YC7LdLMN/NRi8HUqtnu/D3N3v+gH7aKA== 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 4T9Xlr4d9gz15Bs; Thu, 11 Jan 2024 05:09:44 +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 40B59iTB060390; Thu, 11 Jan 2024 05:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B59i6u060387; Thu, 11 Jan 2024 05:09:44 GMT (envelope-from git) Date: Thu, 11 Jan 2024 05:09:44 GMT Message-Id: <202401110509.40B59i6u060387@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: a1978b83d43f - main - cad/py-amaranth: update 0.3-160 =?utf-8?Q?=E2=86=92?= 0.4.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: a1978b83d43f5a900b8240215698de33ad84d363 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1978b83d43f5a900b8240215698de33ad84d363 commit a1978b83d43f5a900b8240215698de33ad84d363 Author: Yuri Victorovich AuthorDate: 2024-01-11 05:09:31 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-11 05:09:39 +0000 cad/py-amaranth: update 0.3-160 → 0.4.0 Reported by: portscout --- cad/py-amaranth/Makefile | 14 +++++--------- cad/py-amaranth/distinfo | 6 +++--- cad/py-amaranth/files/patch-pyproject.toml | 30 +++++------------------------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/cad/py-amaranth/Makefile b/cad/py-amaranth/Makefile index 5c7a2cdd8790..e8f694c65e8d 100644 --- a/cad/py-amaranth/Makefile +++ b/cad/py-amaranth/Makefile @@ -1,7 +1,6 @@ PORTNAME= amaranth DISTVERSIONPREFIX= v -DISTVERSION= 0.3-160 -DISTVERSIONSUFFIX= -gb952005 +DISTVERSION= 0.4.0 CATEGORIES= cad python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +10,12 @@ WWW= https://amaranth-lang.org/docs/amaranth/latest/ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdm-backend>0:devel/py-pdm-backend@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyvcd>0:cad/py-pyvcd@${PY_FLAVOR} +TEST_DEPENDS= sby:cad/symbiyosys \ + yosys:cad/yosys USES= python USE_PYTHON= pep517 autoplist pytest @@ -25,13 +25,9 @@ GH_ACCOUNT= amaranth-lang NO_ARCH= yes -# workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272771 -PEP517_INSTALL_CMD= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION:S/-/.post/}*.whl +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-patch: - @${REINPLACE_CMD} \ - -e 's|from setuptools_scm.git import parse as parse_git|return "v${DISTVERSION}"|' \ - ${WRKSRC}/setup.py @${REINPLACE_CMD} \ -e 's|%%VERSION%%|${DISTVERSION}|' \ ${WRKSRC}/pyproject.toml diff --git a/cad/py-amaranth/distinfo b/cad/py-amaranth/distinfo index 4bb3f520c209..8642e68838bb 100644 --- a/cad/py-amaranth/distinfo +++ b/cad/py-amaranth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690525544 -SHA256 (amaranth-lang-amaranth-v0.3-160-gb952005_GH0.tar.gz) = 8bdab7fbd10dc07d99a383316b2503dd00733b6dd99e787e0ffe4cb27f8eb112 -SIZE (amaranth-lang-amaranth-v0.3-160-gb952005_GH0.tar.gz) = 261933 +TIMESTAMP = 1704939098 +SHA256 (amaranth-lang-amaranth-v0.4.0_GH0.tar.gz) = f377c113af9d6772331509fff72cf19d060cd16849981ce32b6eeb94d64c62eb +SIZE (amaranth-lang-amaranth-v0.4.0_GH0.tar.gz) = 307888 diff --git a/cad/py-amaranth/files/patch-pyproject.toml b/cad/py-amaranth/files/patch-pyproject.toml index 00ed445714f6..e19d759d8171 100644 --- a/cad/py-amaranth/files/patch-pyproject.toml +++ b/cad/py-amaranth/files/patch-pyproject.toml @@ -1,11 +1,11 @@ ---- pyproject.toml.orig 2023-07-27 13:04:20 UTC +--- pyproject.toml.orig 2023-12-13 09:29:50 UTC +++ pyproject.toml -@@ -1,12 +1,13 @@ - # Project metadata +@@ -4,12 +4,13 @@ source = "scm" + source = "scm" [project] --dynamic = ["version", "urls"] -+dynamic = ["urls"] +-dynamic = ["version"] ++dynamic = [] name = "amaranth" description = "Amaranth hardware definition language" @@ -15,23 +15,3 @@ requires-python = "~=3.8" dependencies = [ -@@ -26,7 +27,7 @@ amaranth-rpc = "amaranth.rpc:main" - # Build system configuration - - [build-system] --requires = ["wheel", "setuptools>=67.0", "setuptools_scm[toml]>=6.2"] -+requires = ["wheel", "setuptools>0", "setuptools_scm[toml]>=6.2"] - build-backend = "setuptools.build_meta" - - [tool.setuptools] -@@ -36,8 +37,8 @@ build-backend = "setuptools.build_meta" - # Add a workaround to improve experience for people upgrading from old checkouts. - packages = ["amaranth"] - --[tool.setuptools_scm] --local_scheme = "node-and-timestamp" -+#[tool.setuptools_scm] -+#local_scheme = "node-and-timestamp" - - # Development workflow configuration -