Bump rextendr. (#161)

mlondschien · Jan 2, 2024 · cf96028 · cf96028
1 parent f26c80b
commit cf96028
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 
 # Changelog
 
+## 1.1.2 - (2024-01-02)
+
+**Other changes:**
+
+- Upgraded `extendr-api` and `ndarray` dependencies in R package.
+
 ## 1.1.1 - (2023-10-03)
 
 **Other changes:**

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "changeforest"
 description = "Random Forests for Change Point Detection"
 authors = ["Malte Londschien <malte@londschien.ch>"]
 repository = "https://github.com/mlondschien/changeforest/"
-version = "1.1.1"
+version = "1.1.2"
 edition = "2021"
 readme = "README.md"
 license = "BSD-3-Clause"

diff --git a/changeforest-py/Cargo.toml b/changeforest-py/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "changeforest_py"
-version = "1.1.1"
+version = "1.1.2"
 edition = "2021"
 
 [lib]

diff --git a/changeforest-py/pyproject.toml b/changeforest-py/pyproject.toml
@@ -2,7 +2,7 @@
 name = "changeforest"
 description = "Random Forests for Change Point Detection"
 readme = "README.md"
-version = "1.1.1"
+version = "1.1.2"
 requires-python = ">=3.8"
 author = "Malte Londschien <malte@londschien.ch>"
 urls = {homepage = "https://github.com/mlondschien/changeforest/"}

diff --git a/changeforest-r/DESCRIPTION b/changeforest-r/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: changeforest
 Type: Package
 Title: Random Forests for Change Point Detection
-Version: 1.1.1
+Version: 1.1.2
 Author: Malte Londschien
 Maintainer: Malte Londschien <malte@londschien.ch>
 Description:

diff --git a/changeforest-r/src/rust/Cargo.toml b/changeforest-r/src/rust/Cargo.toml
@@ -1,18 +1,14 @@
 [package]
 name = 'changeforestr'
-version = '1.1.1'
+version = '1.1.2'
 edition = '2021'
 
 [lib]
 name = 'changeforest'
 crate-type = [ 'staticlib' ]
 
 [dependencies]
-extendr-api = { version="0.2.0", features = ["ndarray"] }
+extendr-api = { version="0.6.0", features = ["ndarray"] }
 changeforest = { path = "../../../" }
-ndarray = "0.15.3"
-biosphere = "0.3.0"
-
-[patch.crates-io]
-libR-sys = { git = "https://github.com/extendr/libR-sys", rev = "355cf0de0dd7f28cfa3933a70b29deb247eb2017" }
-extendr-api = { git = "https://github.com/extendr/extendr", rev = "a59d65c50e001810dadba2d8624517a36b4725d2" } 
+ndarray = "0.15.6"
+biosphere = "0.3.0"
diff --git a/changeforest-r/src/rust/src/lib.rs b/changeforest-r/src/rust/src/lib.rs
@@ -6,9 +6,9 @@ mod result;
 
 use crate::control::MyControl;
 use crate::result::MyBinarySegmentationResult;
+use ::ndarray;
 use changeforest::wrapper;
 use extendr_api::prelude::*;
-use ndarray;
 
 #[extendr]
 fn changeforest_api(