Skip to content

Commit 476f032

Browse files
committed
fix: updated reticulate syntax v0.7.4
1 parent aed3d4e commit 476f032

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

DESCRIPTION

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: chromConverter
22
Title: Chromatographic File Converter
3-
Version: 0.7.3
3+
Version: 0.7.4
44
Authors@R: c(
55
person(given = "Ethan", family = "Bass", email = "ethanbass@gmail.com",
66
role = c("aut", "cre"),
@@ -28,7 +28,7 @@ Imports:
2828
fs,
2929
purrr,
3030
readxl,
31-
reticulate,
31+
reticulate (>= 1.41),
3232
stringr,
3333
tidyr,
3434
utils,
@@ -47,12 +47,6 @@ Suggests:
4747
testthat (>= 3.0.0),
4848
mzR,
4949
chromConverterExtraTests
50-
Config/reticulate: list( packages = list(list(package = "scipy"),
51-
list(package="numpy"),
52-
list(package = "pandas"),
53-
list(package="Aston", pip = TRUE),
54-
list(package="rainbow-api", pip = TRUE),
55-
list(package = "olefile", pip = TRUE)) )
5650
Encoding: UTF-8
5751
Language: en-US
5852
Roxygen: list(markdown = TRUE)

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## chromConverter 0.7.4
2+
3+
* Small updates to documentation.
4+
* Use newer syntax for reticulate (hopefully this will solve some of the issues with python environments)
5+
16
## chromConverter 0.7.3
27

38
* Updated `read_shimadzu_lcd` to infer retention times in Shimadzu 3D Data from `Max Plot` stream since it is always (?) present.

R/zzz.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.onLoad <- function(libname, pkgname){
2-
try(env <- reticulate::configure_environment("chromConverter"))
2+
reticulate::py_require(packages = c("Aston", "olefile", "pandas", "rainbow-api", "scipy"))
33
try({trace_file <<- reticulate::import("aston.tracefile", delay_load = TRUE)},
44
silent = TRUE)
55
try({pd <<- reticulate::import("pandas", delay_load = TRUE)}, silent = TRUE)

0 commit comments

Comments
 (0)