chore: rust lint

Author: ccrutchf

.github/workflows/cargo-test.yml

@@ -0,0 +1,18 @@
+name: Cargo Test
+
+on: [push, workflow_dispatch]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
+    - uses: astral-sh/setup-uv@v5
+      with:
+        python-version: "3.12"
+    - name: Run Rust unit tests
+      run: uv run cargo test --lib

.github/workflows/clippy.yml

@@ -0,0 +1,17 @@
+name: Clippy
+
+on: [push, workflow_dispatch]
+
+jobs:
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        components: clippy
+    - uses: astral-sh/setup-uv@v5
+      with:
+        python-version: "3.12"
+    - name: Run Clippy
+      run: uv run cargo clippy --lib -- -D warnings

.github/workflows/pylint.yml

@@ -10,15 +10,13 @@ jobs:
         python-version: ["3.11", "3.12"]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - uses: dtolnay/rust-toolchain@stable
+    - uses: astral-sh/setup-uv@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip poetry
-        poetry config virtualenvs.create false
-        poetry install
+      run: uv sync --dev
+    - name: Build Rust extension
+      run: uv run maturin develop
     - name: Analysing the code with pylint
-      run: |
-        python -m pylint $(git ls-files '*.py')
+      run: uv run pylint $(git ls-files '*.py')

.github/workflows/pytest.yml

@@ -10,24 +10,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v5
+    - uses: dtolnay/rust-toolchain@stable
+    - uses: astral-sh/setup-uv@v5
       with:
-        python-version: 3.12
+        python-version: "3.12"
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip poetry
-        poetry config virtualenvs.create false
-        poetry install
-    - name: Test
-      run: |
-        coverage run --branch -m pytest tests/
-    - name: Generate Report
-      run: |
-        coverage html
-    - name: Upload report
+      run: uv sync --dev
+    - name: Build Rust extension
+      run: uv run maturin develop
+    - name: Rust unit tests
+      run: uv run cargo test --lib
+    - name: Python tests with coverage
+      run: uv run coverage run --branch -m pytest tests/
+    - name: Generate coverage report
+      run: uv run coverage html
+    - name: Upload coverage report
       uses: actions/upload-artifact@v4
       with:
         name: coverage-report-${{ matrix.os }}
-        path: |
-          htmlcov/*
+        path: htmlcov/*

.github/workflows/release.yml

@@ -19,9 +19,46 @@ jobs:
         fetch-depth: 0
         token: ${{ secrets.RELEASER }}
 
+    - uses: dtolnay/rust-toolchain@stable
+
+    - uses: astral-sh/setup-uv@v5
+      with:
+        python-version: "3.12"
+
+    - name: Install dependencies
+      run: uv sync --dev
 
     - name: Python Semantic Release
+      id: psr
       uses: python-semantic-release/python-semantic-release@v9.8.6
       with:
         github_token: ${{ secrets.RELEASER }}
         root_options: "-vv"
+
+  build-wheels:
+    name: Build wheels (${{ matrix.os }})
+    needs: release
+    if: needs.release.outputs.released == 'true'
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: write
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ needs.release.outputs.tag }}
+        token: ${{ secrets.RELEASER }}
+
+    - uses: PyO3/maturin-action@v1
+      with:
+        command: build
+        args: --release --out dist
+        manylinux: auto
+
+    - name: Upload wheels to release
+      env:
+        GH_TOKEN: ${{ secrets.RELEASER }}
+      run: gh release upload ${{ needs.release.outputs.tag }} dist/*.whl

Cargo.toml

@@ -20,3 +20,11 @@ thiserror = "2"
 
 [dev-dependencies]
 tempfile = "3"
+
+[lints.rust]
+# create_exception! internally uses #[cfg(feature = "gil-refs")] in pyo3 0.22
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("gil-refs"))'] }
+
+[lints.clippy]
+# PyO3 #[pymethods] PyResult<T> return types trigger a false positive
+useless_conversion = "allow"

src/db.rs

@@ -202,30 +202,6 @@ impl DatasetDb {
         Ok(missions)
     }
 
-    pub fn get_mission(&self, name: &str) -> Result<MissionRecord> {
-        let row = self.conn.query_row(
-            "SELECT name, path, timestamp, device, country, region, site, mission_name, properties, notes \
-             FROM missions WHERE name=?1",
-            params![name],
-            |row| {
-                Ok(MissionRecord {
-                    name: row.get(0)?,
-                    path: row.get(1)?,
-                    metadata: MetadataRecord {
-                        timestamp: row.get(2)?,
-                        device: row.get(3)?,
-                        country: row.get(4)?,
-                        region: row.get(5)?,
-                        site: row.get(6)?,
-                        mission_name: row.get(7)?,
-                        properties: row.get(8)?,
-                        notes: row.get(9)?,
-                    },
-                })
-            },
-        )?;
-        Ok(row)
-    }
 
     // ── mission staged files ───────────────────────────────────
 

src/lib.rs

@@ -436,6 +436,7 @@ impl PyDataManager {
         Ok(())
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn initialize_mission(
         &mut self,
         timestamp: &str,
@@ -587,6 +588,7 @@ impl PyDataManager {
         Ok(output)
     }
 
+    #[pyo3(signature = (dataset, day=None, mission=None, root_dir=None))]
     fn activate(
         &mut self,
         dataset: &str,
@@ -597,8 +599,7 @@ impl PyDataManager {
         // Find or load the dataset
         let ds_state = if self.inner.find_dataset(dataset).is_some() {
             let info = self.inner.find_dataset(dataset).cloned().unwrap();
-            let state = dataset::load_dataset_state(&PathBuf::from(&info.root_path))?;
-            state
+            dataset::load_dataset_state(&PathBuf::from(&info.root_path))?
         } else if let Some(ref rdir) = root_dir {
             let dataset_path = PathBuf::from(rdir).join(dataset);
             if !dataset_path.is_dir() {
@@ -658,6 +659,7 @@ impl PyDataManager {
         Ok(())
     }
 
+    #[pyo3(signature = (paths, readme, destination=None))]
     fn add(
         &mut self,
         paths: Vec<String>,

src/manager.rs

@@ -1,7 +1,7 @@
 use std::path::{Path, PathBuf};
 
 use crate::db::{DatasetInfo, ManagerDb};
-use crate::errors::{E4EError, Result};
+use crate::errors::Result;
 
 /// Current manager schema version.
 const VERSION: i32 = 2;
@@ -110,21 +110,7 @@ impl DataManagerState {
         Ok(())
     }
 
-    /// Return the root path for an active dataset name.
-    pub fn active_dataset_root(&self) -> Result<Option<PathBuf>> {
-        match &self.active_dataset_name {
-            None => Ok(None),
-            Some(name) => {
-                match self.find_dataset(name) {
-                    Some(info) => Ok(Some(PathBuf::from(&info.root_path))),
-                    None => Err(E4EError::Runtime(format!(
-                        "Active dataset '{}' not found in registry",
-                        name
-                    ))),
-                }
-            }
-        }
-    }
+
 }