Merge branch 'amaranth-lang:main' into main

Author: slagernate

.git_archival.txt

@@ -1,2 +1 @@
-.git_archival.txt export-subst
 /amaranth/vendor/* -linguist-vendored

.gitattributes

@@ -0,0 +1 @@
+* @whitequark

.github/CODEOWNERS

@@ -1,17 +1,22 @@
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  merge_group:
+
 name: CI
 jobs:
+
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-        - '3.7'
         - '3.8'
         - '3.9'
         - '3.10'
         - '3.11'
-        - 'pypy-3.7-v7.3.3'
+        - 'pypy-3.8'
+        - 'pypy-3.9'
         allow-failure:
         - false
         include:
@@ -20,12 +25,19 @@ jobs:
     continue-on-error: '${{ matrix.allow-failure }}'
     name: 'test (${{ matrix.python-version }})'
     steps:
+    - name: Preserve Wasm cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cache/wasmtime
+          ~/.cache/YoWASP
+        key: ${{ runner.os }}-wasm
     - name: Check out source code
       uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Set up Python
-      uses: actions/setup-python@v4
+    - name: Set up PDM
+      uses: pdm-project/setup-pdm@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -34,25 +46,21 @@ jobs:
         sudo add-apt-repository 'deb http://ppa.launchpad.net/sri-csl/formal-methods/ubuntu bionic main'
         sudo apt-get update
         sudo apt-get install yices2
-        pip install coverage codecov
-        pip install yowasp-yosys==0.20.* # last version compatible with Python 3.7
-        pip install -e .[builtin-yosys]
-        pip install -r docs/requirements.txt
-    - name: Preserve Wasm cache
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.cache/wasmtime
-          ~/.cache/yowasp
-        key: ${{ runner.os }}-wasm
+        pip install codecov yowasp-yosys
+        pdm install --dev
     - name: Run tests
+      env:
+        YOSYS: yowasp-yosys
+        NEXTPNR_ICE40: yowasp-nextpnr-ice40
+        ICEPACK: yowasp-icepack
+        SBY: yowasp-sby
+        SMTBMC: yowasp-yosys-smtbmc
       run: |
-        export AMARANTH_USE_YOSYS=builtin YOSYS=yowasp-yosys SBY=yowasp-sby SMTBMC=yowasp-yosys-smtbmc
-        export PYTHONWARNINGS=error
-        python -m coverage run -m unittest discover -t . -s tests
-        unset PYTHONWARNINGS
-        sphinx-build -b doctest docs/ docs/_build
+        pdm run test
+    - name: Submit code coverage
+      run:
         codecov
+
   document:
     runs-on: ubuntu-latest
     steps:
@@ -63,22 +71,31 @@ jobs:
       - name: Fetch tags from upstream repository
         run: |
           git fetch --tags https://github.com/amaranth-lang/amaranth.git
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - name: Set up PDM
+        uses: pdm-project/setup-pdm@v3
         with:
           python-version: '3.11'
       - name: Install dependencies
         run: |
-          pip install -r docs/requirements.txt
-          pip install .
+          pdm install --dev
       - name: Build documentation
         run: |
-          sphinx-build docs docs/_build
+          pdm run document
       - name: Upload documentation archive
         uses: actions/upload-artifact@v3
         with:
           name: docs
           path: docs/_build
+
+  required: # group all required workflows into one for the required status check
+    needs:
+      - test
+      - document
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          true
+
   publish-docs:
     needs: document
     if: github.repository == 'amaranth-lang/amaranth'
@@ -111,6 +128,7 @@ jobs:
           branch: main
           folder: docs/
           target-folder: docs/amaranth/${{ github.ref_name }}/
+
   publish-docs-dev:
     needs: document
     if: github.repository != 'amaranth-lang/amaranth'

.github/workflows/main.yaml

@@ -1,9 +1,14 @@
 # Python
 __pycache__/
-/*.egg-info
-/.eggs
+*.egg-info
 /dist
 
+# pdm
+/.pdm-plugins
+/.pdm-python
+/.venv
+/pdm.lock
+
 # coverage
 /.coverage
 /htmlcov

.gitignore

@@ -41,7 +41,9 @@ FOSS toolchains are listed in **bold**.
 
 ## Community
 
-Amaranth has a dedicated IRC channel, [#amaranth-lang at libera.chat](https://web.libera.chat/#amaranth-lang). Feel free to join to ask questions about using Amaranth or discuss ongoing development of Amaranth and its related projects.
+Amaranth has a dedicated IRC channel, [#amaranth-lang at libera.chat](https://web.libera.chat/#amaranth-lang), which is _bridged_[^1] to Matrix at [#amaranth-lang:matrix.org](https://matrix.to/#/#amaranth-lang:matrix.org). Feel free to join to ask questions about using Amaranth or discuss ongoing development of Amaranth and its related projects.
+
+[^1]: The same messages appear on IRC and on Matrix, and one can participate in the discussion equally using either communication system.
 
 ## License
 

README.md

@@ -1,14 +1,13 @@
+# Extract version for this package from the environment package metadata. This used to be a lot
+# more difficult in earlier Python versions, and the `__version__` field is a legacy of that time.
+import importlib.metadata
 try:
-    try:
-        from importlib import metadata as importlib_metadata # py3.8+ stdlib
-    except ImportError:
-        import importlib_metadata # py3.7- shim
-    __version__ = importlib_metadata.version(__package__)
-except ImportError:
-    # No importlib_metadata. This shouldn't normally happen, but some people prefer not installing
-    # packages via pip at all, instead using PYTHONPATH directly or copying the package files into
-    # `lib/pythonX.Y/site-packages`. Although not a recommended way, we still try to support it.
+    __version__ = importlib.metadata.version(__package__)
+except importlib.metadata.PackageNotFoundError:
+    # No importlib metadata for this package. This shouldn't normally happen, but some people
+    # prefer not installing packages via pip at all. Although not recommended we still support it.
     __version__ = "unknown" # :nocov:
+del importlib
 
 
 from .hdl import *

amaranth/__init__.py

@@ -4,13 +4,7 @@
 import subprocess
 import warnings
 import pathlib
-try:
-    from importlib import metadata as importlib_metadata # py3.8+ stdlib
-except ImportError:
-    try:
-        import importlib_metadata # py3.7- shim
-    except ImportError:
-        importlib_metadata = None # not installed
+from importlib import metadata as importlib_metadata
 try:
     from importlib import resources as importlib_resources
     try:

amaranth/_toolchain/cxx.py

@@ -28,6 +28,8 @@ def __new__(cls, *args, src_loc_at=0, **kwargs):
     def __del__(self):
         if self._MustUse__silence:
             return
+        if getattr(self._MustUse__warning, "_MustUse__silence", False):
+            return
         if hasattr(self, "_MustUse__used") and not self._MustUse__used:
             if get_linter_option(self._MustUse__context["filename"],
                                  self._MustUse__warning.__name__, bool, True):