Merge pull request #83 from vkottler/dev/wasm

Initial sync.

Author: vkottler

.github/workflows/python-package.yml

@@ -19,6 +19,7 @@ jobs:
       matrix:
         python-version:
           - "3.11"
+          - "3.12"
         system:
           - ubuntu-latest
           - macos-latest
@@ -54,6 +55,10 @@ jobs:
         if: matrix.system == 'ubuntu-latest'
       - run: sudo apt-get install gcc-13 g++-13 clang-17 clang-format-17
         if: matrix.system == 'ubuntu-latest'
+      - run: sudo apt-get install emscripten
+        if: matrix.system == 'ubuntu-latest'
+      - run: em++ --version
+        if: matrix.system == 'ubuntu-latest'
       # End project-specific setup.
 
       - run: mk python-sa-types
@@ -72,7 +77,7 @@ jobs:
         env:
           PY_TEST_EXTRA_ARGS: --cov-report=xml
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v3.1.5
 
       - run: mk pypi-upload-ci
         env:
@@ -85,7 +90,7 @@ jobs:
 
       - run: |
           mk python-release owner=vkottler \
-                            repo=yambs version=2.8.1
+                            repo=yambs version=3.0.0
         if: |
           matrix.python-version == '3.11'
           && matrix.system == 'ubuntu-latest'

README.md

@@ -2,11 +2,11 @@
     =====================================
     generator=datazen
     version=3.1.4
-    hash=4976235943725fd73fdb02c40af8f1cb
+    hash=807e0a42a738120cbe4629477dbbafe5
     =====================================
 -->
 
-# yambs ([2.8.1](https://pypi.org/project/yambs/))
+# yambs ([3.0.0](https://pypi.org/project/yambs/))
 
 [![python](https://img.shields.io/pypi/pyversions/yambs.svg)](https://pypi.org/project/yambs/)
 ![Build Status](https://github.com/vkottler/yambs/workflows/Python%20Package/badge.svg)
@@ -30,6 +30,7 @@
 This package is tested with the following Python minor versions:
 
 * [`python3.11`](https://docs.python.org/3.11/)
+* [`python3.12`](https://docs.python.org/3.12/)
 
 ## Platform Support
 

config

@@ -14,6 +14,7 @@ ci_local:
   - "- run: mk python-editable"
   - "  if: matrix.system == 'ubuntu-latest'"
 
+  # Get latest clang.
   - "- name: setup clang 17"
   - "  run: |"
   - "    wget https://apt.llvm.org/llvm.sh"
@@ -22,9 +23,16 @@ ci_local:
   - "    rm llvm.sh"
   - "  if: matrix.system == 'ubuntu-latest'"
 
+  # Native toolchains.
   - "- run: sudo apt-get install gcc-13 g++-13 clang-17 clang-format-17"
   - "  if: matrix.system == 'ubuntu-latest'"
 
+  # WASM.
+  - "- run: sudo apt-get install emscripten"
+  - "  if: matrix.system == 'ubuntu-latest'"
+  - "- run: em++ --version"
+  - "  if: matrix.system == 'ubuntu-latest'"
+
 requirements:
   - datazen
   - vcorelib>=2.4.2

local/configs/package.yaml

@@ -3,8 +3,9 @@ author_info:
   name: Vaughn Kottler
   email: [email protected]
   username: vkottler
-versions: ["3.11"]
 
+# CI matrix.
+versions: ["3.11", "3.12"]
 systems:
   - macos-latest
   - windows-latest

local/configs/python.yaml

@@ -1,5 +1,5 @@
 ---
-major: 2
-minor: 8
-patch: 1
+major: 3
+minor: 0
+patch: 0
 entry: mbs

local/variables/package.yaml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "yambs"
-version = "2.8.1"
+version = "3.0.0"
 description = "Yet another meta build-system."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -16,6 +16,7 @@ maintainers = [
 ]
 classifiers = [
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Operating System :: Microsoft :: Windows",
   "Operating System :: MacOS",
   "Operating System :: POSIX :: Linux",

pyproject.toml

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=f3af34a4b5815c617489419b194b30b5
+# hash=ce50fe613526c5b8b8b7fd8527e3566d
 # =====================================
 
 """
@@ -29,6 +29,7 @@
     "description": DESCRIPTION,
     "versions": [
         "3.11",
+        "3.12",
     ],
 }
 setup(

setup.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.1.4
-# hash=9f62028523c3b5a953733ca89dcc3018
+# hash=7d378a1752611508007a77d4ca39a5af
 # =====================================
 """
 A module for project-specific task registration.
@@ -20,14 +20,9 @@ def audit_local_tasks() -> None:
     """Ensure that shared task infrastructure is present."""
 
     local = Path(__file__).parent.joinpath("mklocal")
-
-    # Also link a top-level file.
     top_level = local.parent.parent.joinpath("mklocal")
-    if not top_level.is_symlink():
-        assert not top_level.exists()
-        top_level.symlink_to(local)
 
-    if local.is_symlink():
+    if local.is_symlink() and top_level.is_symlink():
         return
 
     # If it's not a symlink, it shouldn't be any other kind of file.
@@ -48,6 +43,11 @@ def audit_local_tasks() -> None:
     # Create the link.
     local.symlink_to(vmklib)
 
+    # Also link a top-level file.
+    if not top_level.is_symlink():
+        assert not top_level.exists()
+        top_level.symlink_to(local)
+
 
 def register(
     manager: TaskManager,

tasks/conf.py

@@ -18,13 +18,25 @@
 from yambs.entry import main as yambs_main
 
 
+def test_native_command_wasm():
+    """Test the 'native' command with WASM variants."""
+
+    with in_dir(clean_scenario("native3")):
+        assert yambs_main([PKG_NAME, "native"]) == 0
+
+        # Try to build (if we can).
+        if platform == "linux" and which("ninja"):
+            run(["ninja", "wasm"], check=True)
+
+
 def test_native_command_basic():
     """Test the 'native' command."""
 
     path = str(clean_scenario("native"))
 
     # Ensure the directory dependency is cleaned as well.
     clean_scenario("native2")
+    clean_scenario("native3")
 
     with in_dir(path):
         assert yambs_main([PKG_NAME, "native", "-w", "-i"]) == 0