Bump to amaranth 0.4.

wanda-phi · whitequark · commit 170675812b71 · 2023-12-13T15:02:57.000Z
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,13 +20,13 @@ jobs:
         - 'pypy-3.9'
         # this version range needs to be synchronized with the one in pyproject.toml
         amaranth-version:
-        - '0.3'
+        - '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.3'
+        - amaranth-version: '0.4'
           allow-failure: false
         - amaranth-version: 'git'
           allow-failure: true
@@ -43,10 +43,6 @@ jobs:
         if: ${{ matrix.amaranth-version != 'git' }}
         run: |
           pip install 'amaranth==${{ matrix.amaranth-version }}'
-      - name: Downgrade MarkupSafe
-        if: ${{ matrix.amaranth-version == '0.3' }}
-        run: |
-          pip install 'MarkupSafe==2.0.1'
       - name: Install Amaranth from git
         if: ${{ matrix.amaranth-version == 'git' }}
         run: |
diff --git a/amaranth_boards/alchitry_au.py b/amaranth_boards/alchitry_au.py
@@ -3,7 +3,7 @@
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arrow_deca.py b/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 *
 
 
diff --git a/amaranth_boards/arty_a7.py b/amaranth_boards/arty_a7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arty_s7.py b/amaranth_boards/arty_s7.py
@@ -3,7 +3,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arty_z7.py b/amaranth_boards/arty_z7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/atlys.py b/amaranth_boards/atlys.py
@@ -2,7 +2,7 @@
 import textwrap
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/blackice.py b/amaranth_boards/blackice.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/blackice_ii.py b/amaranth_boards/blackice_ii.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/chameleon96.py b/amaranth_boards/chameleon96.py
@@ -3,7 +3,7 @@
 
 from amaranth import *
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/cmod_a7.py b/amaranth_boards/cmod_a7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 """
diff --git a/amaranth_boards/cmod_s7.py b/amaranth_boards/cmod_s7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 """
diff --git a/amaranth_boards/colorlight_5a75b_r7_0.py b/amaranth_boards/colorlight_5a75b_r7_0.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/de0.py b/amaranth_boards/de0.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de0_cv.py b/amaranth_boards/de0_cv.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de10_lite.py b/amaranth_boards/de10_lite.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de10_nano.py b/amaranth_boards/de10_nano.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de1_soc.py b/amaranth_boards/de1_soc.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/ebaz4205.py b/amaranth_boards/ebaz4205.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/ecp5_5g_evn.py b/amaranth_boards/ecp5_5g_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ecpix5.py b/amaranth_boards/ecpix5.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/fomu_hacker.py b/amaranth_boards/fomu_hacker.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/fomu_pvt.py b/amaranth_boards/fomu_pvt.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/genesys2.py b/amaranth_boards/genesys2.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/ice40_hx1k_blink_evn.py b/amaranth_boards/ice40_hx1k_blink_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ice40_hx8k_b_evn.py b/amaranth_boards/ice40_hx8k_b_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ice40_up5k_b_evn.py b/amaranth_boards/ice40_up5k_b_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icebreaker.py b/amaranth_boards/icebreaker.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icebreaker_bitsy.py b/amaranth_boards/icebreaker_bitsy.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icestick.py b/amaranth_boards/icestick.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icesugar.py b/amaranth_boards/icesugar.py
@@ -1,7 +1,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icesugar_nano.py b/amaranth_boards/icesugar_nano.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/kc705.py b/amaranth_boards/kc705.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/kcu105.py b/amaranth_boards/kcu105.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/logicbone.py b/amaranth_boards/logicbone.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/machxo3_sk.py b/amaranth_boards/machxo3_sk.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_machxo_2_3l import *
+from amaranth.vendor import LatticeMachXO3LPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/mercury.py b/amaranth_boards/mercury.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/microzed_z010.py b/amaranth_boards/microzed_z010.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 
 
 __all__ = ["MicroZedZ010Platform"]
diff --git a/amaranth_boards/microzed_z020.py b/amaranth_boards/microzed_z020.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 
 
 __all__ = ["MicroZedZ020Platform"]
diff --git a/amaranth_boards/mister.py b/amaranth_boards/mister.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/nandland_go.py b/amaranth_boards/nandland_go.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/nexys4ddr.py b/amaranth_boards/nexys4ddr.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/numato_mimas.py b/amaranth_boards/numato_mimas.py
diff --git a/amaranth_boards/orangecrab_r0_1.py b/amaranth_boards/orangecrab_r0_1.py
diff --git a/amaranth_boards/orangecrab_r0_2.py b/amaranth_boards/orangecrab_r0_2.py
diff --git a/amaranth_boards/quickfeather.py b/amaranth_boards/quickfeather.py
diff --git a/amaranth_boards/rz_easyfpga_a2_2.py b/amaranth_boards/rz_easyfpga_a2_2.py
diff --git a/amaranth_boards/sk_xc6slx9.py b/amaranth_boards/sk_xc6slx9.py
diff --git a/amaranth_boards/supercon19badge.py b/amaranth_boards/supercon19badge.py
diff --git a/amaranth_boards/tang_nano.py b/amaranth_boards/tang_nano.py
diff --git a/amaranth_boards/tang_nano_9k.py b/amaranth_boards/tang_nano_9k.py
diff --git a/amaranth_boards/te0714_03_50_2I.py b/amaranth_boards/te0714_03_50_2I.py
diff --git a/amaranth_boards/tinyfpga_ax1.py b/amaranth_boards/tinyfpga_ax1.py
diff --git a/amaranth_boards/tinyfpga_ax2.py b/amaranth_boards/tinyfpga_ax2.py
diff --git a/amaranth_boards/tinyfpga_bx.py b/amaranth_boards/tinyfpga_bx.py
diff --git a/amaranth_boards/ulx3s.py b/amaranth_boards/ulx3s.py
diff --git a/amaranth_boards/upduino_v1.py b/amaranth_boards/upduino_v1.py
diff --git a/amaranth_boards/upduino_v2.py b/amaranth_boards/upduino_v2.py
diff --git a/amaranth_boards/upduino_v3.py b/amaranth_boards/upduino_v3.py
diff --git a/amaranth_boards/versa_ecp5.py b/amaranth_boards/versa_ecp5.py
diff --git a/amaranth_boards/zturn_lite_z007s.py b/amaranth_boards/zturn_lite_z007s.py
diff --git a/pyproject.toml b/pyproject.toml
