diff --git a/.copier-answers.yaml b/.copier-answers.yaml index f501ed7..f305bbc 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: d814faa +_commit: 2f83523 _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: cppjswasm diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 966372b..28f5494 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,11 +25,38 @@ permissions: jobs: build: + name: build (${{ matrix.name }}) runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest] + include: + - name: ubuntu-latest + dist_path: dist + os: ubuntu-latest + python: "3.11" + target: native + - name: ubuntu-24.04-arm + dist_path: dist + os: ubuntu-24.04-arm + python: "3.11" + target: native + - name: macos-latest + dist_path: dist + os: macos-latest + python: "3.11" + target: native + - name: windows-latest + dist_path: dist + os: windows-latest + python: "3.11" + target: native + - name: pyodide + dist_path: dist/pyodide + os: ubuntu-latest + python: "3.14" + target: pyodide + steps: - name: Checkout @@ -40,53 +67,63 @@ jobs: - name: Setup Python uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446 with: - version: "3.11" + version: ${{ matrix.python }} - name: Setup Node.js uses: actions-ext/node/setup@0ea5bdcd24d2488b28e16bf611b446a2f8e1e12f with: version: 22.x + if: matrix.target == 'native' - name: Setup C++ uses: actions-ext/cpp/setup@c2b1e90366b3a1c628a1df0748135f5e345ab26f - name: Setup Emscripten uses: mymindstorm/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16 + if: matrix.target == 'native' - name: Install dependencies run: make develop + if: matrix.target == 'native' - name: Lint run: make lint - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Checks run: make checks - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Test run: make coverage + if: matrix.target == 'native' + + - name: Build and test Pyodide wheel + run: make test-pyodide + if: matrix.target == 'pyodide' - name: Upload test results (Python) uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: test-results-${{ matrix.os }} + name: test-results-${{ matrix.name }} path: junit.xml - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Publish test results uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0 with: files: '**/junit.xml' - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Upload coverage uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 with: token: ${{ secrets.CODECOV_TOKEN }} + if: matrix.target == 'native' - name: Install build dependencies run: pip install cibuildwheel + if: matrix.target == 'native' - name: Build distributions (Linux x86_64) run: | @@ -98,7 +135,7 @@ jobs: CIBW_BUILD: "cp311-manylinux*" CIBW_ARCHS_LINUX: native CIBW_BUILD_VERBOSITY: 3 - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Build distributions (Linux ARM64) run: | @@ -109,7 +146,7 @@ jobs: CIBW_BUILD: "cp311-manylinux*" CIBW_ARCHS_LINUX: native CIBW_BUILD_VERBOSITY: 3 - if: matrix.os == 'ubuntu-24.04-arm' + if: matrix.name == 'ubuntu-24.04-arm' - name: Build distributions (macOS) run: | @@ -118,7 +155,7 @@ jobs: env: CIBW_BUILD: "cp311-macos*" CIBW_BUILD_VERBOSITY: 3 - if: matrix.os == 'macos-latest' + if: matrix.name == 'macos-latest' - name: Build distributions (Windows) run: | @@ -126,22 +163,22 @@ jobs: make dist-py-wheel env: CIBW_BUILD: "cp311-win_amd64" - if: matrix.os == 'windows-latest' + if: matrix.name == 'windows-latest' - name: Test wheel uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 with: module: python_template_cppjswasm - if: runner.os == 'Linux' + if: matrix.target == 'native' && runner.os == 'Linux' - name: Test source distribution uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 with: module: python_template_cppjswasm - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Upload distributions uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: dist-${{ matrix.os }} - path: dist + name: dist-${{ matrix.name }} + path: ${{ matrix.dist_path }} diff --git a/.gitignore b/.gitignore index 0062b91..4c2ab81 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,10 @@ __pycache__/ *.exp *.lib +# vcpkg +vcpkg/ +vcpkg_installed/ + # Rust target target-capi @@ -142,6 +146,7 @@ python_template_cppjswasm/labextension # Emscripten SDK (locally installed) emsdk +.pyodide_build/ # Mac .DS_Store diff --git a/Makefile b/Makefile index 1d8e4d2..1dcd837 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,7 @@ develop: develop-cpp develop-js develop-py ## setup project for development .PHONY: requirements-py requirements-js requirements-cpp requirements requirements-py: ## install prerequisite python build requirements - python -m pip install --upgrade pip toml - python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))'` - python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print(" ".join(c["project"]["optional-dependencies"]["develop"]))'` + uv pip install -r pyproject.toml --extra develop requirements-js: ## install prerequisite javascript build requirements cd js; pnpm install && npx playwright install @@ -136,8 +134,13 @@ tests-cpp: test-cpp coverage-cpp: ## run C++ tests and collect test coverage make -C cpp coverage -.PHONY: test coverage tests +.PHONY: test test-pyodide coverage tests test: test-py test-js test-cpp ## run all tests + +test-pyodide: ## build and test the Python package in Pyodide + rm -rf dist/pyodide + uvx --from cibuildwheel==4.2.0 cibuildwheel --only cp314-pyodide_wasm32 --output-dir dist/pyodide . + coverage: coverage-py coverage-js coverage-cpp ## run all tests and collect test coverage # alias diff --git a/pyproject.toml b/pyproject.toml index 8b384e8..c51a72f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "hatchling", - "hatch-cpp>=0.3.7", + "hatch-cpp>=0.5.0", "hatch-js", "pybind11", ] @@ -41,7 +41,7 @@ develop = [ "check-dist", "cibuildwheel", "codespell", - "hatch-cpp>=0.3.7", + "hatch-cpp>=0.5.0", "hatch-js", "hatchling", "pybind11", @@ -104,6 +104,12 @@ archs = "arm64" environment = {SKIP_HATCH_JS="1"} skip = "*win32 *arm_64" +[tool.cibuildwheel.pyodide] +environment = {SKIP_HATCH_JS="1"} +test-command = "python -m pytest -vvv --pyargs python_template_cppjswasm.tests" +test-extras = [] +test-requires = ["pytest"] + [tool.coverage.run] branch = true omit = [ diff --git a/python_template_cppjswasm/tests/__init__.py b/python_template_cppjswasm/tests/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/python_template_cppjswasm/tests/__init__.py @@ -0,0 +1 @@ +