diff --git a/.copier-answers.yaml b/.copier-answers.yaml index a6992dd..00ee08f 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: d814faa +_commit: 8ac03b9 _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: rust diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8164a31..5f0a18a 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,51 +67,60 @@ jobs: - name: Setup Python uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446 with: - version: "3.11" + version: ${{ matrix.python }} - name: Setup Rust uses: actions-ext/rust/setup@2db8e3e4c56beb7320c7d730bd2c2d6a6447bf6b - name: Install dependencies run: make develop + if: matrix.target == 'native' - name: Lint run: make lint + if: matrix.target == 'native' - name: Checks run: make checks - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Build run: make build + if: matrix.target == 'native' - 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: always() + if: always() && matrix.target == 'native' - 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: Free disk space run: | sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc /usr/local/.ghcup /usr/share/swift df -h / shell: bash - if: runner.os == 'Linux' + if: matrix.target == 'native' && runner.os == 'Linux' - name: Build distributions (Linux x86_64) run: | @@ -96,7 +132,7 @@ jobs: shell: bash env: CIBW_ARCHS_LINUX: native - if: matrix.os == 'ubuntu-latest' + if: matrix.name == 'ubuntu-latest' - name: Build distributions (Linux ARM64) run: | @@ -106,7 +142,7 @@ jobs: shell: bash env: CIBW_ARCHS_LINUX: native - if: matrix.os == 'ubuntu-24.04-arm' + if: matrix.name == 'ubuntu-24.04-arm' - name: Build distributions (macOS/Windows) run: | @@ -116,22 +152,22 @@ jobs: shell: bash env: CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=11.0 - if: runner.os != 'Linux' + if: matrix.target == 'native' && runner.os != 'Linux' - name: Test wheel uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 with: module: python_template_rust - 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_rust - 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 d111a98..9b8e090 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,8 @@ python_template_rust/labextension # Emscripten SDK (locally installed) emsdk +.pyodide_build/ + # Mac .DS_Store diff --git a/Makefile b/Makefile index 97b16e0..7326168 100644 --- a/Makefile +++ b/Makefile @@ -110,8 +110,13 @@ tests-rs: test-rs coverage-rs: ## run rust tests and collect test coverage make -C rust coverage -.PHONY: test coverage tests +.PHONY: test test-pyodide coverage tests test: test-py test-rs ## run all tests + +test-pyodide: ## build and test the Python package in Pyodide + rustup target add wasm32-unknown-emscripten + uvx --from cibuildwheel==4.2.0 cibuildwheel --only cp314-pyodide_wasm32 --output-dir dist/pyodide . + coverage: coverage-py coverage-rs ## run all tests and collect test coverage # alias diff --git a/pyproject.toml b/pyproject.toml index a539033..dab384e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "hatchling", - "hatch-rs>=0.1.4", + "hatch-rs>=0.3.0", ] build-backend = "hatchling.build" @@ -39,7 +39,7 @@ develop = [ "check-dist", "cibuildwheel", "codespell", - "hatch-rs", + "hatch-rs>=0.3.0", "hatchling", "mdformat", "mdformat-tables>=1", @@ -111,6 +111,11 @@ archs = "arm64" environment = {PATH="$UserProfile\\.cargo\bin;$PATH", CARGO_TERM_COLOR="always"} skip = "*win32 *arm_64" +[tool.cibuildwheel.pyodide] +test-command = "python -m pytest -vvv --pyargs python_template_rust.tests" +test-extras = [] +test-requires = ["pytest"] +xbuild-tools = ["cargo", "rustc", "rustup"] [tool.coverage.run] branch = true omit = [ diff --git a/python_template_rust/tests/__init__.py b/python_template_rust/tests/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/python_template_rust/tests/__init__.py @@ -0,0 +1 @@ + diff --git a/python_template_rust/tests/test_all.py b/python_template_rust/tests/test_all.py index 2c305dd..1b160bd 100644 --- a/python_template_rust/tests/test_all.py +++ b/python_template_rust/tests/test_all.py @@ -1,5 +1,5 @@ -from python_template_rust import * +from python_template_rust.python_template_rust import Example def test_all(): - assert True + assert str(Example("test")) == "test"