Empty (#156)

* Empty

* clippy.

* Bump maturin.

* Upgrade some more versions.

* add target also for macos-latest arm64 (is this correct?).

* Update pyo3.

* Back to a path dependency.

* Prepare for release.

.github/workflows/build.yml

@@ -56,7 +56,7 @@ jobs:
           platforms: arm64
 
       - name: Install darwin target for apple silicon
-        if: matrix.vers == 'universal2'
+        if: matrix.vers == 'universal2' || (matrix.vers == 'arm64' && matrix.os == 'macos-latest')
         run: rustup target add aarch64-apple-darwin
 
       - name: Setup env when not using docker

CHANGELOG.md

@@ -1,6 +1,12 @@
 
 # Changelog
 
+## 1.1.1 - (2023-10-03)
+
+**Other changes:**
+
+- Upgraded `pyo3` dependency in Python package.
+
 ## 1.1.0 - (2023-08-01)
 
 **New features**:

Cargo.toml

@@ -3,7 +3,7 @@ name = "changeforest"
 description = "Random Forests for Change Point Detection"
 authors = ["Malte Londschien <[email protected]>"]
 repository = "https://github.com/mlondschien/changeforest/"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 readme = "README.md"
 license = "BSD-3-Clause"

changeforest-py/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "changeforest_py"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 
 [lib]
@@ -11,8 +11,8 @@ crate-type = ["cdylib"]
 name = "changeforest"
 
 [dependencies]
-numpy = "0.15"
+numpy = "0.19"
 changeforest = { path = "../" }
-ndarray = "0.15.3"
-pyo3 = {version = "0.15", features = ["extension-module"]}
+ndarray = "0.15"
+pyo3 = {version = "0.19", features = ["extension-module"]}
 biosphere = "0.3.0"

changeforest-py/pyproject.toml

@@ -2,8 +2,8 @@
 name = "changeforest"
 description = "Random Forests for Change Point Detection"
 readme = "README.md"
-version = "1.1.0"
-requires-python = ">=3.7"
+version = "1.1.1"
+requires-python = ">=3.8"
 author = "Malte Londschien <[email protected]>"
 urls = {homepage = "https://github.com/mlondschien/changeforest/"}
 classifiers = [
@@ -12,7 +12,7 @@ classifiers = [
 ]
 
 [build-system]
-requires = ["maturin>=0.11,<0.12"]
+requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
 [tool.isort]

changeforest-py/src/lib.rs

@@ -3,7 +3,7 @@ mod result;
 
 use crate::control::control_from_pyobj;
 use crate::result::{MyBinarySegmentationResult, MyOptimizerResult};
-use changeforest::wrapper;
+use ::changeforest::wrapper;
 use numpy::PyReadonlyArray2;
 use pyo3::prelude::{pymodule, PyModule, PyResult, Python};
 use pyo3::PyObject;

changeforest-py/src/result.rs

@@ -1,9 +1,9 @@
 // Wrap GainResult, OptimizerResult and BinarySegmentationResult.
 // See https://github.com/PyO3/pyo3/issues/287.
 
+use ::changeforest::{BinarySegmentationResult, ModelSelectionResult};
 use changeforest::gain::GainResult;
 use changeforest::optimizer::OptimizerResult;
-use changeforest::{BinarySegmentationResult, ModelSelectionResult};
 use numpy::{PyArray1, PyArray2, ToPyArray};
 use pyo3::prelude::*;
 
@@ -24,10 +24,7 @@ impl MyModelSelectionResult {
     pub fn p_value(&self) -> Option<f64> {
         self.result.p_value
     }
-}
 
-#[pyproto]
-impl pyo3::class::basic::PyObjectProtocol for MyModelSelectionResult {
     fn __repr__(&self) -> PyResult<String> {
         Ok(format!("{}", self.result))
     }
@@ -70,10 +67,7 @@ impl MyGainResult {
     pub fn predictions<'py>(&self, py: Python<'py>) -> Option<&'py PyArray1<f64>> {
         self.result.predictions().map(|arr| arr.to_pyarray(py))
     }
-}
 
-#[pyproto]
-impl pyo3::class::basic::PyObjectProtocol for MyGainResult {
     fn __repr__(&self) -> PyResult<String> {
         Ok(format!("{}", self.result))
     }
@@ -117,13 +111,7 @@ impl MyOptimizerResult {
             })
             .collect()
     }
-}
 
-#[pyproto]
-// https://stackoverflow.com/questions/62666926/str-function-of-class-ported-from-\
-// rust-to-python-using-pyo3-doesnt-get-used
-// https://pyo3.rs/v0.9.2/python_from_rust.html
-impl pyo3::class::basic::PyObjectProtocol for MyOptimizerResult {
     fn __repr__(&self) -> PyResult<String> {
         Ok(format!("{}", self.result))
     }
@@ -228,10 +216,7 @@ impl MyBinarySegmentationResult {
     fn split_points(&self) -> Vec<usize> {
         self.result.split_points()
     }
-}
 
-#[pyproto]
-impl pyo3::class::basic::PyObjectProtocol for MyBinarySegmentationResult {
     fn __repr__(&self) -> PyResult<String> {
         Ok(format!("{}", self.result))
     }

changeforest-r/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: changeforest
 Type: Package
 Title: Random Forests for Change Point Detection
-Version: 1.1.0
+Version: 1.1.1
 Author: Malte Londschien
 Maintainer: Malte Londschien <[email protected]>
 Description:

changeforest-r/src/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = 'changeforestr'
-version = '1.1.0'
+version = '1.1.1'
 edition = '2021'
 
 [lib]

src/fmt.rs

@@ -3,7 +3,7 @@ use std::fmt::Display;
 
 impl Display for BinarySegmentationResult {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut max_lengths = vec![0; 4];
+        let mut max_lengths = [0; 4];
         let mut rows = _format_tree(self);
         rows.insert(
             0,