From 9fcb4eeb1769e67c758fa78b9c0b665d3d7415f5 Mon Sep 17 00:00:00 2001 From: Charlotte Soneson Date: Wed, 5 Nov 2025 19:31:22 +0100 Subject: [PATCH 1/3] Bump version --- DESCRIPTION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 949f087..a317946 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: ezzarr Type: Package Title: Set up conda environment for ez-zarr -Version: 0.1.8 -Date: 2025-09-24 +Version: 0.1.9 +Date: 2025-11-05 Authors@R: c( person("Charlotte", "Soneson", email = "charlottesoneson@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-3833-2169")), @@ -17,7 +17,7 @@ Description: Provides basic functionality for creating and accessing a conda License: MIT + file LICENSE Encoding: UTF-8 LazyData: true -RoxygenNote: 7.3.2 +RoxygenNote: 7.3.3 StagedInstall: no Imports: basilisk, From acdddd2fd6e32206ecd64ebc164f28dcd3c1a0d4 Mon Sep 17 00:00:00 2001 From: Charlotte Soneson Date: Wed, 5 Nov 2025 19:31:59 +0100 Subject: [PATCH 2/3] Adapt to pyenv-based basilisk (Bioc 3.22) --- NEWS.md | 4 ++++ R/basilisk.R | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index e206bc2..b52334d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# ezzarr 0.1.9 + +* Adapt to pyenv-based basilisk + # ezzarr 0.1.8 * Update ez-zarr to v0.4.2 diff --git a/R/basilisk.R b/R/basilisk.R index e8c1697..206f34b 100644 --- a/R/basilisk.R +++ b/R/basilisk.R @@ -1,16 +1,12 @@ #' @importFrom basilisk BasiliskEnvironment -.conda_dependencies <- c( - "python==3.12" -) .pip_dependencies <- c( + "python==3.12", "ez_zarr==0.4.2" ) ezzarrenv <- BasiliskEnvironment( envname = "ezzarr", pkgname = "ezzarr", - packages = .conda_dependencies, - channels = c("conda-forge"), - pip = .pip_dependencies + packages = .pip_dependencies ) From 688436a394661d3eafd8fba5177880af3af3a704 Mon Sep 17 00:00:00 2001 From: Charlotte Soneson Date: Wed, 5 Nov 2025 19:52:46 +0100 Subject: [PATCH 3/3] Temporarily set Bioc version explicitly --- .github/workflows/R-CMD-check.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 1e4b91c..783932e 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -20,9 +20,9 @@ jobs: fail-fast: false matrix: config: - - { os: windows-latest, bioc: 'release'} - - { os: macOS-latest, bioc: 'release', curlConfigPath: '/usr/bin/'} - - { os: ubuntu-latest, bioc: 'release'} + - { os: windows-latest, bioc: '3.22'} + - { os: macOS-latest, bioc: '3.22', curlConfigPath: '/usr/bin/'} + - { os: ubuntu-latest, bioc: '3.22'} #- { os: ubuntu-latest, image: 'bioconductor/bioconductor_docker:devel'} env: