Merge branch 'amaranth-lang:main' into main

Author: slagernate

.github/workflows/main.yaml

@@ -70,7 +70,7 @@ jobs:
       - name: Set up PDM
         uses: pdm-project/setup-pdm@v3
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Install dependencies
         run: |
           pdm install --dev

LICENSE.txt

@@ -1,5 +1,4 @@
 Copyright (C) 2019-2023 Amaranth HDL contributors
-Copyright (C) 2011-2019 M-Labs Limited
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

amaranth/_unused.py

@@ -34,7 +34,7 @@ def __del__(self):
             if get_linter_option(self._MustUse__context["filename"],
                                  self._MustUse__warning.__name__, bool, True):
                 warnings.warn_explicit(
-                    "{!r} created but never used".format(self), self._MustUse__warning,
+                    f"{self!r} created but never used", self._MustUse__warning,
                     **self._MustUse__context)
 
 

amaranth/_utils.py

@@ -6,11 +6,9 @@
 from collections import OrderedDict
 from collections.abc import Iterable
 
-from .utils import *
 
-
-__all__ = ["flatten", "union" , "log2_int", "bits_for", "memoize", "final", "deprecated",
-           "get_linter_options", "get_linter_option"]
+__all__ = ["flatten", "union", "memoize", "final", "deprecated", "get_linter_options",
+           "get_linter_option"]
 
 
 def flatten(i):

amaranth/asserts.py

@@ -1,2 +1,4 @@
-from .hdl.ast import AnyConst, AnySeq, Assert, Assume, Cover
-from .hdl.ast import Past, Stable, Rose, Fell, Initial
+from .hdl._ast import AnyConst, AnySeq, Initial, Assert, Assume, Cover
+
+
+__all__ = ["AnyConst", "AnySeq", "Initial", "Assert", "Assume", "Cover"]

amaranth/back/cxxrtl.py

@@ -23,8 +23,8 @@ def _convert_rtlil_text(rtlil_text, black_boxes, *, src_loc_at=0):
     script = []
     if black_boxes is not None:
         for box_name, box_source in black_boxes.items():
-            script.append("read_ilang <<rtlil\n{}\nrtlil".format(box_source))
-    script.append("read_ilang <<rtlil\n{}\nrtlil".format(rtlil_text))
+            script.append(f"read_ilang <<rtlil\n{box_source}\nrtlil")
+    script.append(f"read_ilang <<rtlil\n{rtlil_text}\nrtlil")
     script.append("write_cxxrtl")
 
     return yosys.run(["-q", "-"], "\n".join(script), src_loc_at=1 + src_loc_at)