feat: adopt maturin (#616)

* feat: adopt maturin Signed-off-by: Keming <[email protected]> * fix ci install dependencies Signed-off-by: Keming <[email protected]> * fix ci install editable Signed-off-by: Keming <[email protected]> * rm all setuptools related code Signed-off-by: Keming <[email protected]> --------- Signed-off-by: Keming <[email protected]>
mosecorg · Jan 9, 2025 · 5968646 · 5968646
1 parent 31acd81
commit 5968646
Show file tree

Hide file tree

Showing 14 changed files with 145 additions and 213 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -39,8 +39,6 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
           python-version: 3.9
@@ -69,8 +67,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -82,8 +78,7 @@ jobs:
           toolchain: nightly
       - name: Install components
         run: |
-          python -m pip install --upgrade pip
-          rustup component add clippy
+          make install
       - name: Test unit
         run: |
           make test_unit

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -20,16 +20,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -e .[dev,mixin]
+          make install
           make dev
       - name: Test
         run: |

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -1,75 +1,143 @@
+# This file added mautrin autogenerated ci file by maturin v1.8.1
+# DO NOT OVERWRITE THIS FILE by `maturin generate-ci github` directly
+
 name: PyPI Publish
 
 on:
   release:
     types: [created]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
-  build:
-    name: "Build PyPI Package"
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
+  linux:
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13, macos-14]
+        platform:
+          - runner: ubuntu-22.04
+            target: x86_64
+          - runner: ubuntu-22.04
+            target: x86
+          - runner: ubuntu-22.04
+            target: aarch64
+          - runner: ubuntu-22.04
+            target: armv7
+          - runner: ubuntu-22.04
+            target: s390x
+          - runner: ubuntu-22.04
+            target: ppc64le
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist
+          sccache: 'true'
+          manylinux: auto
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-${{ matrix.platform.target }}
+          path: dist
 
+  musllinux:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: ubuntu-22.04
+            target: x86_64
+          - runner: ubuntu-22.04
+            target: x86
+          - runner: ubuntu-22.04
+            target: aarch64
+          - runner: ubuntu-22.04
+            target: armv7
     steps:
       - uses: actions/checkout@v4
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
         with:
-          fetch-depth: 0
-      - name: Set up Python
-        uses: actions/setup-python@v5
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist
+          sccache: 'true'
+          manylinux: musllinux_1_2
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
         with:
-          python-version: 3.11
-      - name: Build
-        run: |
-          python -m pip install pipx
-          pipx run cibuildwheel
+          name: wheels-musllinux-${{ matrix.platform.target }}
+          path: dist
+
+  macos:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: macos-13
+            target: x86_64
+          - runner: macos-14
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist
+          sccache: 'true'
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels_${{ github.event.release.tag_name }}_${{ matrix.os }}
-          retention-days: 1
-          path: ./wheelhouse/*.whl
+          name: wheels-macos-${{ matrix.platform.target }}
+          path: dist
 
-  publish:
-    name: "Publish PyPI Package"
+  sdist:
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    needs: [build]
     steps:
       - uses: actions/checkout@v4
+      - name: Build sdist
+        uses: PyO3/maturin-action@v1
         with:
-          fetch-depth: 0
-      - uses: actions/setup-python@v5
+          command: sdist
+          args: --out dist
+      - name: Upload sdist
+        uses: actions/upload-artifact@v4
         with:
-          python-version: 3.9
+          name: wheels-sdist
+          path: dist
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
+    needs: [linux, musllinux, macos, sdist]
+    permissions:
+      # Use to sign the release artifacts
+      id-token: write
+      # Used to upload release artifacts
+      contents: write
+      # Used to generate artifact attestation
+      attestations: write
+    steps:
       - uses: actions/download-artifact@v4
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
         with:
-          pattern: wheels_${{ github.event.release.tag_name }}_*
-          merge-multiple: true
-          path: dist/
-      - name: Prepare PyPI package
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel
-          python setup.py sdist
-          ls dist/
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+          subject-path: 'wheels-*/*'
+      - name: Publish to PyPI
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: PyO3/maturin-action@v1
         with:
-          skip-existing: true
-      - name: Publish Crates
-        env:
-          CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}
-        run: |
-          cargo login $CRATES_TOKEN
-          cargo publish
+          command: upload
+          args: --non-interactive --skip-existing wheels-*/*
 
   image:
     name: "Build Docker Image"

diff --git a/.github/workflows/page.yml b/.github/workflows/page.yml
@@ -30,8 +30,6 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
     - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
     - name: Setup Pages
       uses: actions/configure-pages@v5
     - name: Set up Python
@@ -40,8 +38,7 @@ jobs:
         python-version: 3.9
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -e .[dev,doc,mixin]
+        make install
     - name: Generate docs
       run: |
         cd docs && make html

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mosec"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Keming <[email protected]>", "Zichen <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/Makefile b/Makefile
@@ -1,19 +1,16 @@
 .DEFAULT_GOAL:=dev
 
-PY_SOURCE_FILES=mosec tests examples setup.py
+PY_SOURCE_FILES=mosec tests examples
 RUST_SOURCE_FILES=src/*
 
 install:
-	pip install -e .[dev,doc,mixin]
+	pip install -r requirements/dev.txt -r requirements/mixin.txt -r requirements/doc.txt
 	pre-commit install
 	rustup toolchain install nightly
-	rustup component add rustfmt --toolchain nightly
+	rustup component add rustfmt clippy --toolchain nightly
 
 dev:
-	cargo build
-	@mkdir -p mosec/bin
-	@cp ./target/debug/mosec mosec/bin/mosec
-	pip install -e .[dev]
+	pip install -e .
 
 test: dev
 	@pip install -q -r requirements/mixin.txt
@@ -48,15 +45,11 @@ doc:
 clean:
 	@cargo clean
 	@-rm -rf build/ dist/ .eggs/ site/ *.egg-info .pytest_cache .mypy_cache .ruff_cache
-	@-rm -rf mosec/bin/
 	@-find . -name '*.pyc' -type f -exec rm -rf {} +
 	@-find . -name '__pycache__' -exec rm -rf {} +
 
 package: clean
-	PRODUCTION_MODE=yes python setup.py bdist_wheel
-
-cross_compile: clean
-	cibuildwheel --platform linux
+	maturin build --release --out dist
 
 publish: package
 	twine upload dist/*
@@ -78,7 +71,7 @@ semantic_lint:
 	@cargo clippy -- -D warnings
 
 version:
-	@python -m setuptools_scm
+	@cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "mosec") | .version'
 
 add_license:
 	@addlicense -c "MOSEC Authors" **/*.py **/*.rs **/**/*.py

diff --git a/mosec/__init__.py b/mosec/__init__.py
@@ -26,13 +26,6 @@
 from mosec.server import Server
 from mosec.worker import SSEWorker, Worker
 
-try:
-    from mosec._version import __version__  # type: ignore
-except ImportError:
-    from setuptools_scm import get_version  # type: ignore
-
-    __version__ = get_version(root="..", relative_to=__file__)
-
 __all__ = [
     "ClientError",
     "DecodingError",