Merged origin/main into read-arrow

Author: Aariq

CITATION.cff

@@ -8,7 +8,7 @@ message: 'To cite package "fluxnet" in publications use:'
 type: software
 license: MIT
 title: 'fluxnet: Download, Read, and Visualize FLUXNET Data'
-version: 0.3.1
+version: 0.3.2
 doi: 10.5281/zenodo.19210221
 abstract: Utility functions to help download, read in, and work with data from FLUXNET.
 authors:
@@ -21,7 +21,7 @@ authors:
   orcid: https://orcid.org/0000-0002-6462-3288
 repository-code: https://github.com/EcosystemEcologyLab/fluxnet-package
 url: https://ecosystemecologylab.github.io/fluxnet-package/
-date-released: '2026-05-05'
+date-released: '2026-05-07'
 contact:
 - family-names: Scott
   given-names: Eric R.

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: fluxnet
 Title: Download, Read, and Visualize FLUXNET Data
-Version: 0.3.1.9000
+Version: 0.3.2.9000
 Authors@R: c(
     person(c("Eric", "R."), "Scott", , "ericrscott@arizona.edu", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-7430-7879")),

NEWS.md

@@ -1,5 +1,9 @@
 # fluxnet (development version)
 
+# fluxnet 0.3.2
+
+* Fixes a bug introduced in 0.3.1 when more than one site id is provided to `site_ids`.
+
 # fluxnet 0.3.1
 
 * `site_ids = "all"` is deprecated in favor of `site_ids = NULL` in all functions with this argument.

R/flux_badm.R

@@ -32,7 +32,7 @@ flux_badm <- function(
   )
 ) {
   if (!is.null(site_ids)) {
-    if (site_ids == "all") {
+    if (any(site_ids == "all")) {
       cli::cli_warn(
         "Setting {.arg site_ids = 'all'} is deprecated. Using {.arg site_ids = NULL} instead."
       )

R/flux_download.R

@@ -53,7 +53,7 @@ flux_download <- function(
   ...
 ) {
   if (!is.null(site_ids)) {
-    if (site_ids == "all") {
+    if (any(site_ids == "all")) {
       cli::cli_warn(
         "Setting {.arg site_ids = 'all'} is deprecated. Using {.arg site_ids = NULL} instead."
       )

R/flux_extract.R

@@ -48,7 +48,7 @@ flux_extract <- function(
   overwrite = FALSE
 ) {
   if (!is.null(site_ids)) {
-    if (site_ids == "all") {
+    if (any(site_ids == "all")) {
       cli::cli_warn(
         "Setting {.arg site_ids = 'all'} is deprecated. Using {.arg site_ids = NULL} instead."
       )

R/flux_read.R

@@ -49,7 +49,7 @@ flux_read <- function(
   site_ids = NULL
 ) {
   if (!is.null(site_ids)) {
-    if (site_ids == "all") {
+    if (any(site_ids == "all")) {
       cli::cli_warn(
         "Setting {.arg site_ids = 'all'} is deprecated. Using {.arg site_ids = NULL} instead."
       )

R/flux_varinfo.R

@@ -38,7 +38,7 @@ flux_varinfo <- function(
   site_ids = NULL
 ) {
   if (!is.null(site_ids)) {
-    if (site_ids == "all") {
+    if (any(site_ids == "all")) {
       cli::cli_warn(
         "Setting {.arg site_ids = 'all'} is deprecated. Using {.arg site_ids = NULL} instead."
       )

inst/CITATION

@@ -14,4 +14,4 @@ bibentry(bibtype = "Misc",
          url = "https://ecosystemecologylab.github.io/fluxnet-package/",
          abstract = "Utility functions to help download, read in, and work with data from FLUXNET.",
          keywords = "ameriflux,fluxnet",
-         version = "0.3.1")
+         version = "0.3.2")

tests/testthat/test-flux_extract.R

@@ -45,4 +45,17 @@ test_that("network arg works", {
       "TERN_AU-Wom_FLUXNET_FLUXMET_YY_2010-2024_v1.3_r1.csv"
     )
   )
+})
+
+test_that("site_ids works", {
+  tmpdir <- withr::local_tempdir()
+  out <- flux_extract(
+    zip_dir = test_path("testdata"),
+    output_dir = tmpdir,
+    site_ids = c("AR-CCg", "AU-Wom"),
+    resolutions = c("y"),
+    extract_varinfo = FALSE,
+    extract_txt = FALSE
+  )
+  expect_s3_class(out, "data.frame")
 })