Update workflow

.github/workflows/publish_to_pypi.yml → .github/workflows/release.yml

@@ -1,11 +1,17 @@
+# This file is autogenerated by maturin v1.4.0
+# To update, run
+#
+#    maturin generate-ci github
+#
 name: CI
 
 on:
   push:
     branches:
       - main
+      - master
     tags:
-      - "*"
+      - "v[0-9]+.[0-9]+.[0-9]+"
   pull_request:
   workflow_dispatch:
 
@@ -21,31 +27,13 @@ env:
   RUSTFLAGS: "-Dwarnings"
 
 jobs:
-  linux_tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target: [x86_64]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Set up Rust
-        run: rustup show
-      - uses: mozilla-actions/sccache-action@v0.0.3
-      - run: python3 -m venv venv
-      - run: cargo fmt --all && cargo clippy --all-features
-      - run: maturin develop
-      - run: pytest
-
   linux:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         target: [x86_64, x86, aarch64, armv7]
+    env:
+      PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -126,12 +114,12 @@ jobs:
 
   release:
     name: Release
-    if: "startsWith(github.ref, 'refs/tags/')"
-    needs: [linux, windows, macos, sdist]
     runs-on: ubuntu-latest
-    environment: pypi
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    needs: [linux, windows, macos, sdist]
+    environment: release
     permissions:
-      id-token: write # IMPORTANT: mandatory for trusted publishing
+      id-token: write
     steps:
       - uses: actions/download-artifact@v3
         with:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "polars_fuzzy_match"
-version = "0.1.0"
+version = "0.1.2"
 edition = "2021"
 
 [lib]

Makefile

@@ -1,7 +1,7 @@
 .SILENT:
 .DEFAULT_GOAL:=dev
 
-.PHONY: run build-dev clean format
+.PHONY: run build-dev clean format lint
 dev: build-dev
 	python examples/usage.py
 
@@ -13,6 +13,10 @@ build-dev: .build-dev
 
 format:
 	ruff format polars_fuzzy_match/
+	cargo fmt --all
+
+lint:
+	cargo clippy --all-features
 
 clean:
 	rm .build-dev

pyproject.toml

@@ -16,6 +16,9 @@ requires-python = ">=3.10"
 "Change Log" = "https://github.com/bnm3k/polars-fuzzy-match/releases"
 "Issue Tracker" = "https://github.com/bnm3k/polars-fuzzy-match/issues"
 
+[build-system]
+requires = ["maturin>=1.0,<2.0", "polars>=0.20.6"]
+build-backend = "maturin"
 
 [tool.ruff]
 line-length = 80

src/fuzzy_match.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::unused_unit)]
 use polars::prelude::*;
 use pyo3_polars::derive::polars_expr;
 use pyo3_polars::export::polars_core::utils::CustomIterTools;
@@ -50,7 +51,7 @@ pub enum PatternCaseMatching {
 // exact match
 #[polars_expr(output_type=UInt32)]
 fn fuzzy_match_score(haystack: &[Series], kwargs: FuzzyMatchKwargs) -> PolarsResult<Series> {
-    let ca = (&haystack[0]).str()?;
+    let ca = haystack[0].str()?;
 
     // config
     let config = nucleo::Config::DEFAULT;
@@ -62,7 +63,7 @@ fn fuzzy_match_score(haystack: &[Series], kwargs: FuzzyMatchKwargs) -> PolarsRes
         .map(|v: Option<&str>| {
             if let Some(s) = v {
                 let haystack = Utf32Str::new(s, &mut buf);
-                pattern.score(haystack, &mut matcher).map(|v| v as u32)
+                pattern.score(haystack, &mut matcher)
             } else {
                 None
             }