shr-parser 0.1.5__tar.gz → 0.1.9__tar.gz

{shr_parser-0.1.5 → shr_parser-0.1.9}/.github/workflows/CI.yml

@@ -1,4 +1,4 @@
-# This file is autogenerated by maturin v1.6.0
+# This file is autogenerated by maturin v1.8.1
 # To update, run
 #
 #    maturin generate-ci github
@@ -24,17 +24,17 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86_64
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: aarch64
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: armv7
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: s390x
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: ppc64le
     steps:
       - uses: actions/checkout@v4
@@ -59,13 +59,13 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86_64
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: aarch64
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: armv7
     steps:
       - uses: actions/checkout@v4
@@ -117,7 +117,7 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: macos-12
+          - runner: macos-13
             target: x86_64
           - runner: macos-14
             target: aarch64
@@ -156,11 +156,23 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
     needs: [linux, musllinux, windows, 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:
+          subject-path: 'wheels-*/*'
       - name: Publish to PyPI
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: PyO3/maturin-action@v1
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}

{shr_parser-0.1.5 → shr_parser-0.1.9}/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "autocfg"
@@ -69,16 +69,6 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
-[[package]]
-name = "matrixmultiply"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
 [[package]]
 name = "memmap"
 version = "0.7.0"
@@ -98,46 +88,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "ndarray"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
-dependencies = [
- "matrixmultiply",
- "num-complex",
- "num-integer",
- "num-traits",
- "rawpointer",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -161,9 +111,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.22.1"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e99090d12f6182924499253aaa1e73bf15c69cea8d2774c3c781e35badc3548"
+checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -179,9 +129,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.22.1"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7879eb018ac754bba32cb0eec7526391c02c14a093121857ed09fbf1d1057d41"
+checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -189,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.22.1"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce2baa5559a411fc1cf519295f24c34b53d5d725818bc96b5abf94762da09041"
+checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -199,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.22.1"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049621c20a23f2def20f4fe67978d1da8d8a883d64b9c21362f3b776e254edc7"
+checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -211,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.22.1"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e969ee2e025435f1819d31a275ba4bb9cbbdf3ac535227fdbd85b9322ffe144"
+checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -231,12 +181,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -279,20 +223,19 @@ dependencies = [
 
 [[package]]
 name = "shr_parser"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ef87e9f8644f6debfc91b0b0e715b6a49b78ff51fbdb6cc62bdcbc2fd3e9a4"
+checksum = "059ae9d14772a3811d0549afa66207858e6c13760d2c987b1fb2714719afd820"
 dependencies = [
  "byteorder",
  "memmap",
- "ndarray",
  "rayon",
  "serde",
 ]
 
 [[package]]
 name = "shr_parser_py"
-version = "0.1.5"
+version = "0.1.9"
 dependencies = [
  "pyo3",
  "shr_parser",

{shr_parser-0.1.5 → shr_parser-0.1.9}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "shr_parser_py"
 description = "Python bindings for the shr_parser Rust crate"
-version = "0.1.5"
+version = "0.1.9"
 edition = "2021"
 license = "GPL-3.0-only"
 authors = ["Lasse Nielsen <lasse@xerrion.dk>"]
@@ -15,5 +15,5 @@ crate-type = ["cdylib"]
 name = "shr_parser"
 
 [dependencies]
-pyo3 = { version = "0.22.1", features = ["extension-module"] }
-shr_parser = "1.0.5"
+pyo3 = { version = "0.23.4", features = ["extension-module"] }
+shr_parser = "1.0.8"

{shr_parser-0.1.5 → shr_parser-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: shr_parser
-Version: 0.1.5
+Version: 0.1.9
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -9,10 +9,12 @@ Summary: Parses sweeps from a Signal Hound Spike file.
 Author: Lasse Nielsen
 Author-email: Lasse Nielsen <lasse@xerrion.dk>
 License: GPL-3.0-only
-Requires-Python: >=3.8, <=3.12
+Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Source Code, https://github.com/Xerrion/shr_parser_py
 
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/xerrion/shr_parser_py/CI.yml) ![GitHub License](https://img.shields.io/github/license/xerrion/shr_parser_py) ![Crates.io Version](https://img.shields.io/crates/v/shr_parser_py?link=https%3A%2F%2Fcrates.io%2Fcrates%2Fshr_parser_py)
+
 # SHR Parser Python Bindings
 
 This project provides Python bindings for the Rust-based `shr_parser` library, which is designed to parse and handle SHR files. The SHR file format includes a file header and multiple sweeps, each with its own header and data. This library uses memory mapping for efficient file reading and Rayon for parallel processing of sweeps.
@@ -78,14 +80,14 @@ A class representing a parser for SHR files.
 Here is an example usage of the SHRParser class:
 
 ```python
-import shr_parser
+from shr_parser import SHRParser, SHRParsingType
 
 # Define the file path and parsing type
 file_path = "path/to/your/shrfile.shr"
-parsing_type = 0  # SHRParsingType::Peak
+parsing_type = SHRParsingType.PEAK
 
 # Create a parser instance
-parser = shr_parser.SHRParser(file_path, parsing_type)
+parser = SHRParser(file_path, parsing_type)
 
 # Get file path
 print(parser.get_file_path())

{shr_parser-0.1.5 → shr_parser-0.1.9}/README.md

@@ -1,3 +1,5 @@
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/xerrion/shr_parser_py/CI.yml) ![GitHub License](https://img.shields.io/github/license/xerrion/shr_parser_py) ![Crates.io Version](https://img.shields.io/crates/v/shr_parser_py?link=https%3A%2F%2Fcrates.io%2Fcrates%2Fshr_parser_py)
+
 # SHR Parser Python Bindings
 
 This project provides Python bindings for the Rust-based `shr_parser` library, which is designed to parse and handle SHR files. The SHR file format includes a file header and multiple sweeps, each with its own header and data. This library uses memory mapping for efficient file reading and Rayon for parallel processing of sweeps.
@@ -63,14 +65,14 @@ A class representing a parser for SHR files.
 Here is an example usage of the SHRParser class:
 
 ```python
-import shr_parser
+from shr_parser import SHRParser, SHRParsingType
 
 # Define the file path and parsing type
 file_path = "path/to/your/shrfile.shr"
-parsing_type = 0  # SHRParsingType::Peak
+parsing_type = SHRParsingType.PEAK
 
 # Create a parser instance
-parser = shr_parser.SHRParser(file_path, parsing_type)
+parser = SHRParser(file_path, parsing_type)
 
 # Get file path
 print(parser.get_file_path())

{shr_parser-0.1.5 → shr_parser-0.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "shr_parser"
-requires-python = ">=3.8,<=3.12"
+requires-python = ">=3.8,<4"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",

shr_parser-0.1.9/src/lib.rs

@@ -0,0 +1,151 @@
+use pyo3::prelude::*;
+use pyo3::wrap_pyfunction;
+use shr_parser::{SHRParser, SHRParsingType};
+use std::fmt::{self, Display};
+use std::path::PathBuf;
+
+/// An enum mirroring SHRParsingType for Python.
+#[pyclass(name = "SHRParsingType", eq, eq_int)]
+#[derive(Clone, Copy, Debug, PartialEq)]
+enum PySHRParsingType {
+    PEAK = 0,
+    MEAN = 1,
+    LOW = 2,
+}
+
+impl TryFrom<i32> for PySHRParsingType {
+    type Error = &'static str;
+    fn try_from(value: i32) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(PySHRParsingType::PEAK),
+            1 => Ok(PySHRParsingType::MEAN),
+            2 => Ok(PySHRParsingType::LOW),
+            _ => Err("Invalid value for SHRParsingType"),
+        }
+    }
+}
+
+impl TryFrom<PySHRParsingType> for SHRParsingType {
+    type Error = &'static str;
+    fn try_from(value: PySHRParsingType) -> Result<Self, Self::Error> {
+        match value {
+            PySHRParsingType::PEAK => Ok(SHRParsingType::Peak),
+            PySHRParsingType::MEAN => Ok(SHRParsingType::Mean),
+            PySHRParsingType::LOW => Ok(SHRParsingType::Low),
+        }
+    }
+}
+
+impl Display for PySHRParsingType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            PySHRParsingType::PEAK => write!(f, "SHRParsingType.PEAK"),
+            PySHRParsingType::MEAN => write!(f, "SHRParsingType.MEAN"),
+            PySHRParsingType::LOW => write!(f, "SHRParsingType.LOW"),
+        }
+    }
+}
+
+/// A Python wrapper for a sweep.
+#[pyclass(name = "SHRSweep")]
+struct PySHRSweep {
+    #[pyo3(get)]
+    sweep_number: i32,
+    #[pyo3(get)]
+    timestamp: u64,
+    #[pyo3(get)]
+    frequency: f64,
+    #[pyo3(get)]
+    amplitude: f64,
+    #[pyo3(get)]
+    latitude: f64,
+    #[pyo3(get)]
+    longitude: f64,
+}
+
+#[pymethods]
+impl PySHRSweep {
+    fn __repr__(&self) -> String {
+        format!(
+            "SHRSweep(sweep_number={}, timestamp={}, frequency={}, amplitude={}, Latitude={}, Longitude={})",
+            self.sweep_number, self.timestamp, self.frequency, self.amplitude, self.latitude, self.longitude
+        )
+    }
+}
+
+/// A Python wrapper around SHRParser.
+#[pyclass(name = "SHRParser", subclass)]
+struct PySHRParser {
+    parser: SHRParser,
+    parsing_type: PySHRParsingType,
+}
+
+#[pymethods]
+impl PySHRParser {
+    #[new]
+    fn new(file_path: &str, parsing_type: PySHRParsingType) -> PyResult<Self> {
+        let shr_parsing = SHRParsingType::try_from(parsing_type)
+            .map_err(|e| pyo3::exceptions::PyValueError::new_err(e))?;
+        let parser = SHRParser::new(PathBuf::from(file_path), shr_parsing).map_err(|e| {
+            pyo3::exceptions::PyIOError::new_err(format!("Failed to parse SHR file: {:?}", e))
+        })?;
+        Ok(PySHRParser {
+            parser,
+            parsing_type,
+        })
+    }
+
+    fn __repr__(&self) -> String {
+        format!(
+            "SHRParser(file_path='{}', parsing_type={})",
+            self.parser.get_file_path().to_string_lossy(),
+            self.parsing_type
+        )
+    }
+
+    fn to_csv(&self, path: String) -> PyResult<()> {
+        self.parser.to_csv(PathBuf::from(path)).map_err(|e| {
+            pyo3::exceptions::PyIOError::new_err(format!("Failed to write to CSV: {:?}", e))
+        })
+    }
+
+    fn get_sweeps(&self) -> PyResult<Vec<PySHRSweep>> {
+        let sweeps = self.parser.get_sweeps();
+        Ok(sweeps
+            .into_iter()
+            .map(|sweep| PySHRSweep {
+                sweep_number: sweep.number,
+                timestamp: sweep.header.timestamp,
+                frequency: sweep.frequency,
+                amplitude: sweep.amplitude,
+                latitude: sweep.header.latitude,
+                longitude: sweep.header.longitude,
+            })
+            .collect())
+    }
+
+    fn get_file_header(&self) -> PyResult<String> {
+        let header = self.parser.get_file_header();
+        Ok(format!("{:?}", header))
+    }
+
+    fn get_file_path(&self) -> PyResult<String> {
+        Ok(self.parser.get_file_path().to_string_lossy().into_owned())
+    }
+}
+
+/// Create a new SHRParser instance.
+#[pyfunction]
+fn create_parser(file_path: &str, parsing_type: PySHRParsingType) -> PyResult<PySHRParser> {
+    PySHRParser::new(file_path, parsing_type)
+}
+
+/// A Python module implemented in Rust.
+#[pymodule(name = "shr_parser")]
+fn shr_parser_py(m: &Bound<PyModule>) -> PyResult<()> {
+    m.add_class::<PySHRParser>()?;
+    m.add_class::<PySHRSweep>()?;
+    m.add_class::<PySHRParsingType>()?;
+    m.add_function(wrap_pyfunction!(create_parser, m)?)?;
+    Ok(())
+}

shr_parser-0.1.5/src/lib.rs

@@ -1,61 +0,0 @@
-use pyo3::prelude::*;
-use pyo3::wrap_pyfunction;
-use std::path::PathBuf;
-use ::shr_parser::{SHRParser, SHRParsingType};
-
-/// A wrapper around the SHRParser for Python
-#[pyclass]
-struct PySHRParser {
-    parser: SHRParser,
-}
-
-#[pymethods]
-impl PySHRParser {
-    #[new]
-    fn new(file_path: String, parsing_type: i32) -> PyResult<Self> {
-        let parsing_type = SHRParsingType::try_from(parsing_type).map_err(|e| {
-            pyo3::exceptions::PyValueError::new_err(format!("Invalid parsing type: {}", e))
-        })?;
-        let parser = SHRParser::new(PathBuf::from(file_path), parsing_type).map_err(|e| {
-            pyo3::exceptions::PyIOError::new_err(format!("Failed to parse SHR file: {:?}", e))
-        })?;
-        Ok(PySHRParser { parser })
-    }
-
-    fn to_csv(&self, path: String) -> PyResult<()> {
-        self.parser.to_csv(PathBuf::from(path)).map_err(|e| {
-            pyo3::exceptions::PyIOError::new_err(format!("Failed to write to CSV: {:?}", e))
-        })
-    }
-
-    fn get_sweeps(&self) -> PyResult<Vec<(i32, u64, f64, f64)>> {
-        let sweeps = self.parser.get_sweeps();
-        Ok(sweeps
-            .into_iter()
-            .map(|sweep| (sweep.sweep_number, sweep.timestamp, sweep.frequency, sweep.amplitude))
-            .collect())
-    }
-
-    fn get_file_header(&self) -> PyResult<String> {
-        let header = self.parser.get_file_header();
-        Ok(format!("{:?}", header))
-    }
-
-    fn get_file_path(&self) -> PyResult<String> {
-        Ok(self.parser.get_file_path().to_string_lossy().to_string())
-    }
-}
-
-/// Create a new SHRParser instance.
-#[pyfunction]
-fn create_parser(file_path: String, parsing_type: i32) -> PyResult<PySHRParser> {
-    PySHRParser::new(file_path, parsing_type)
-}
-
-/// A Python module implemented in Rust.
-#[pymodule]
- fn shr_parser(module: &Bound<'_, PyModule>) -> PyResult<()> {
-    module.add_class::<PySHRParser>()?;
-    module.add_function(wrap_pyfunction!(create_parser, module)?)?;
-    Ok(())
-}