Merge branch 'amaranth-lang:main' into main

Author: L0czek

.env.toolchain

@@ -0,0 +1,6 @@
+AMARANTH_USE_YOSYS=builtin
+YOSYS=yowasp-yosys
+NEXTPNR_ICE40=yowasp-nextpnr-ice40
+ICEPACK=yowasp-icepack
+NEXTPNR_ECP5=yowasp-nextpnr-ecp5
+ECPPACK=yowasp-ecppack

.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

.gitattributes

@@ -0,0 +1 @@
+.git_archival.txt export-subst

.github/workflows/main.yml

@@ -1,16 +1,60 @@
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: '0 0 * * *' # test daily against git HEAD of dependencies
+
 name: CI
 jobs:
+
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        - 'pypy-3.8'
+        - 'pypy-3.9'
+        # this version range needs to be synchronized with the one in pyproject.toml
+        amaranth-version:
+        - '0.4'
+        - 'git'
+        allow-failure:
+        - true
+        - false
+        exclude: # all of these are inverted (this is unfortunately the best way to do this)
+        - amaranth-version: '0.4'
+          allow-failure: false
+        - amaranth-version: 'git'
+          allow-failure: true
+    continue-on-error: '${{ matrix.allow-failure }}'
+    name: "test (${{ matrix.python-version }}, ${{ matrix.amaranth-version }}${{ matrix.allow-failure == 'false' && ', required' || '' }})"
     steps:
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
-      - name: Install dependencies
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Amaranth release
+        if: ${{ matrix.amaranth-version != 'git' }}
         run: |
-          pip install wheel
-      - name: Test
+          pip install 'amaranth[builtin-yosys] ==${{ matrix.amaranth-version }}'
+      - name: Install Amaranth from git
+        if: ${{ matrix.amaranth-version == 'git' }}
         run: |
-          python setup.py test
+          pip install 'amaranth[builtin-yosys] @ git+https://github.com/amaranth-lang/amaranth.git'
+      - name: Run tests
+        run: |
+          python -m unittest discover -t . -s amaranth_boards -p '*.py'
+
+  required: # group all required workflows into one to avoid reconfiguring this in Actions settings
+    needs:
+      - test
+    if: ${{ always() && !contains(needs.*.result, 'cancelled') }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: ${{ contains(needs.*.result, 'failure') && 'false' || 'true' }}

.gitignore

@@ -1,8 +1,13 @@
 # Python
-*.pyc
-/*.egg-info
-/.eggs
+__pycache__/
+*.egg-info
 /dist
 
+# pdm
+/.pdm-plugins
+/.pdm-python
+/.venv
+/pdm.lock
+
 # misc user-created
 /build

LICENSE.txt

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

amaranth_boards/__init__.py

@@ -1,9 +1,7 @@
 try:
-    try:
-        from importlib import metadata as importlib_metadata # py3.8+ stdlib
-    except ImportError:
-        import importlib_metadata # py3.7- shim
+    from importlib import metadata as importlib_metadata
     __version__ = importlib_metadata.version(__package__)
+    del importlib_metadata
 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

amaranth_boards/alchitry_au.py

@@ -3,7 +3,7 @@
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
@@ -20,7 +20,7 @@ def find_loader():
     return (loader_prgm, bridge_bin)
 
 
-class AlchitryAuPlatform(Xilinx7SeriesPlatform):
+class AlchitryAuPlatform(XilinxPlatform):
     device      = "XC7A35T" # Artix 7 33K LEs
     package     = "FTG256"
     speed       = "1"

amaranth_boards/arrow_deca.py

@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 

amaranth_boards/arty_a7.py

@@ -1,15 +1,16 @@
 import os
 import subprocess
+import unittest
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
 __all__ = ["ArtyA7_35Platform", "ArtyA7_100Platform"]
 
 
-class _ArtyA7Platform(Xilinx7SeriesPlatform):
+class _ArtyA7Platform(XilinxPlatform):
     package     = "csg324"
     speed       = "1L"
     default_clk = "clk100"
@@ -225,6 +226,12 @@ class ArtyA7_100Platform(_ArtyA7Platform):
     device      = "xc7a100ti"
 
 
+class TestCase(unittest.TestCase):
+    def test_smoke(self):
+        from .test.blinky import Blinky
+        ArtyA7_35Platform().build(Blinky(), do_build=False)
+
+
 if __name__ == "__main__":
     from .test.blinky import *
     ArtyA7_35Platform().build(Blinky(), do_program=True)