usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

_toolchain.yosys: fix amaranth-yosys version extractor.

Browse source
This commit is contained in:
Catherine 2024-04-06 07:56:13 +00:00
parent 6857daff54
commit df589a54e0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
amaranth/_toolchain/yosys.py
View file

@ -120,8 +120,8 @@ class _BuiltinYosys(YosysBinary):
@classmethod @classmethod
def version(cls): def version(cls):
version = importlib_metadata.version(cls.YOSYS_PACKAGE) version = importlib_metadata.version(cls.YOSYS_PACKAGE)
match = re.match(r"^(\d+)\.(\d+)(?:\.post(\d+))?", version) match = re.match(r"^(\d+)\.(\d+)\.(?:\d+)(?:\.(\d+))?(?:\.post(\d+))?", version)
return (int(match[1]), int(match[2]), int(match[3] or 0)) return (int(match[1]), int(match[2]), int(match[3] or 0), int(match[4] or 0))
@classmethod @classmethod
def data_dir(cls): def data_dir(cls):

2
pyproject.toml
View file

@ -44,7 +44,7 @@ build-backend = "pdm.backend"
[tool.pdm] [tool.pdm]
# Remove this once we no longer support Python 3.8. # Remove this once we no longer support Python 3.8.
ignore_package_warnings = ["sphinx*"] ignore_package_warnings = ["sphinx*", "alabaster"]
[tool.pdm.build] [tool.pdm.build]
# If amaranth 0.3 is checked out with git (e.g. as a part of a persistent editable install or # If amaranth 0.3 is checked out with git (e.g. as a part of a persistent editable install or