diff --git a/.github/workflows/check-full.yaml b/.github/workflows/check-full.yaml index ca479740..794a482b 100644 --- a/.github/workflows/check-full.yaml +++ b/.github/workflows/check-full.yaml @@ -35,10 +35,8 @@ jobs: - {os: windows-latest, r: 'release', pkgext: '.zip'} - {os: windows-latest, r: 'oldrel', pkgext: '.zip'} - # ubuntu-latest is 24 as of 2024-10-31. Should we use it? - {os: ubuntu-latest, r: 'release', pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"} - {os: ubuntu-latest, r: 'oldrel', pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"} - # - {os: ubuntu-22.04, r: 'oldrel-2', pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"} # Skipping the oldrel-2, as we need equal requirements across platforms env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true diff --git a/DESCRIPTION b/DESCRIPTION index a32a8e43..76760886 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: RstoxFramework -Version: 4.2.1-9006 -Date: 2026-06-23 +Version: 4.2.1 +Date: 2026-06-26 Title: The Engine of StoX Authors@R: c( person(given = "Arne Johannes", @@ -51,14 +51,14 @@ Imports: jsonvalidate (>= 1.3.0), methods (>= 3.6.0), ncdf4 (>= 1.18), - RstoxBase (>= 2.2.1-9006), - RstoxData (>= 2.2.1-9008), + RstoxBase (>= 2.2.1), + RstoxData (>= 2.2.1), scales (>= 1.1.0), semver (>= 0.2.0), sf (>= 0.9.0), stringi (>= 1.4.0) Suggests: - RstoxFDA (>= 1.7.0-9999), + RstoxFDA (>= 1.7.0), tinytest (>= 1.2.0) Additional_repositories: https://stoxproject.github.io/repo diff --git a/R/Framework.R b/R/Framework.R index 56db4552..6873f7c4 100644 --- a/R/Framework.R +++ b/R/Framework.R @@ -7104,6 +7104,10 @@ writeStoxOutput <- function( # Then, unlist introduces dots, and we replace by underscore: x <- unlistToDataType(x) + # Get the file extension: + outputFileType <- getDefaultOutputFileType(x) + + # Stop if the optional 'filePath' does not have the same length as the data: if(!missing(filePath)) { if(length(filePath) != length(x)) { @@ -7112,9 +7116,6 @@ writeStoxOutput <- function( } else { - # Get the file extension: - outputFileType <- getDefaultOutputFileType(x) - # Set the default file name: filePath <- getProcessOutputTextFilePath( projectPath = projectPath, diff --git a/inst/extdata/functionArguments.rds b/inst/extdata/functionArguments.rds index 7b70eb30..718bef5c 100644 Binary files a/inst/extdata/functionArguments.rds and b/inst/extdata/functionArguments.rds differ diff --git a/inst/versions/OfficialRstoxFrameworkVersions.txt b/inst/versions/OfficialRstoxFrameworkVersions.txt index bf74105f..14a2b4c1 100644 --- a/inst/versions/OfficialRstoxFrameworkVersions.txt +++ b/inst/versions/OfficialRstoxFrameworkVersions.txt @@ -102,3 +102,4 @@ StoX RstoxFramework Dependencies OptionalDependencies Official Date 4.2.1-9003 4.2.1-9004 RstoxBase_2.2.1-9003,RstoxData_2.2.1-9005 RstoxFDA_1.7.0-9999 FALSE 2026-05-22 4.2.1-9004 4.2.1-9005 RstoxBase_2.2.1-9005,RstoxData_2.2.1-9007 RstoxFDA_1.7.0-9999 FALSE 2026-06-13 4.2.1-9005 4.2.1-9006 RstoxBase_2.2.1-9006,RstoxData_2.2.1-9008 RstoxFDA_1.7.0-9999 FALSE 2026-06-23 +4.2.1 4.2.1 RstoxBase_2.2.1,RstoxData_2.2.1 RstoxFDA_1.7.0 TRUE 2026-06-26