Merge pull request #860 from zapta/main

Added apio.ini macros.

Author: zapta

apio/scons/gtkwave_util.py

@@ -19,11 +19,11 @@ def _get_gtkw_file_header(testbench_path: str) -> str:
     tb_path_posix = Path(testbench_path).as_posix()
 
     lines = [
-        f"# GTKWave display configuration for 'apio sim {tb_path_posix}'",
-        f"# {GTKW_AUTO_FILE_MARKER}.",
-        "# DO NOT EDIT IT MANUALLY!",
-        f"# To customize this file, run 'apio sim {tb_path_posix}'",
-        "# and save the file from GTKWave.",
+        f"[*] GTKWave display configuration for 'apio sim {tb_path_posix}'",
+        f"[*] {GTKW_AUTO_FILE_MARKER}.",
+        "[*] DO NOT EDIT IT MANUALLY!",
+        f"[*] To customize this file, run 'apio sim {tb_path_posix}'",
+        "[*] and save the file from GTKWave.",
         "",
         "[*] GTKWave Analyzer v3.4.0 (w)1999-2022 BSI",
         "",

pyproject.toml

@@ -24,8 +24,11 @@ classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
-        'Programming Language :: Python',
+        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         'Natural Language :: English',
         'Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)',
 ]
@@ -45,7 +48,6 @@ requires = [
     'tinyfpgab==1.1.0',
     'tinyprog==1.0.21',
     'icefunprog==2.0.3',
-    'apycula==0.15',
     'apollo_fpga==1.1.1',
     'protobuf==6.33.0',
     'rich==14.0.0',

tests/unit_tests/scons/test_gtkwave_util.py

@@ -9,11 +9,11 @@
 
 # Expected default gtkw file lines for the examples we use below.
 EXPECTED_GTKW_LINES = [
-    "# GTKWave display configuration for 'apio sim main_tb.v'",
-    "# THIS FILE WAS GENERATED AUTOMATICALLY BY APIO.",
-    "# DO NOT EDIT IT MANUALLY!",
-    "# To customize this file, run 'apio sim main_tb.v'",
-    "# and save the file from GTKWave.",
+    "[*] GTKWave display configuration for 'apio sim main_tb.v'",
+    "[*] THIS FILE WAS GENERATED AUTOMATICALLY BY APIO.",
+    "[*] DO NOT EDIT IT MANUALLY!",
+    "[*] To customize this file, run 'apio sim main_tb.v'",
+    "[*] and save the file from GTKWave.",
     "",
     "[*] GTKWave Analyzer v3.4.0 (w)1999-2022 BSI",
     "",