diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2024-01-11 05:09:31 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2024-01-11 05:09:39 +0000 |
| commit | a1978b83d43f5a900b8240215698de33ad84d363 (patch) | |
| tree | 7d778804961cb25e6338d1cb23d9da8846bc7778 /cad | |
| parent | cef1515a37601684ebf277719ebb8d5569a0bac3 (diff) | |
| download | ports-a1978b83d43f5a900b8240215698de33ad84d363.tar.gz ports-a1978b83d43f5a900b8240215698de33ad84d363.zip | |
cad/py-amaranth: update 0.3-160 → 0.4.0
Reported by: portscout
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/py-amaranth/Makefile | 14 | ||||
| -rw-r--r-- | cad/py-amaranth/distinfo | 6 | ||||
| -rw-r--r-- | 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,14 +25,10 @@ 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 - |