Merge pull request #398 from StoXProject/StoXv4.1.0

Version 2.1.0, see NEWS.md.

.github/workflows/check-full.yaml

@@ -35,7 +35,7 @@ jobs:
           - {os: windows-latest, r: 'release', pkgext: '.zip'}
           - {os: windows-latest, r: 'oldrel',  pkgext: '.zip'}
 
-          - {os: ubuntu-latest,  r: 'release', pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"}
+          - {os: ubuntu-22.04,  r: 'release', pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"}
           - {os: ubuntu-22.04,   r: 'oldrel',  pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"}
           - {os: ubuntu-22.04,   r: 'oldrel-1',  pkgext: '.tar.gz', rspm: "https://cloud.r-project.org"}
 
@@ -146,11 +146,7 @@ jobs:
       ## 2c. R packages needed for this yaml script (not related to the Rstox package itself):
       - name: Install CRANdependencies
         run: |
-          install.packages(c("rcmdcheck", "git2r", "sessioninfo", "knitr", "remotes"))
-          
-          # Using the latest drat that supports big sur (after inputs from us). 
-          # When the next drat appears on CRAN this can be changed to install from CRAN:
-          remotes::install_github(repo = 'eddelbuettel/drat', dependencies = FALSE)
+          install.packages(c("rcmdcheck", "git2r", "sessioninfo", "knitr", "remotes", "drat"))
         shell: Rscript {0}
 
 

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RstoxData
-Version: 2.0.1-9007
-Date: 2024-10-31
+Version: 2.1.0
+Date: 2024-11-04
 Title: Tools to Read and Manipulate Fisheries Data
 Authors@R: c(
   person(given = "Edvin", 
@@ -24,7 +24,7 @@ Authors@R: c(
     role = "aut"), 
   person(given = "Norwegian Institute of Marine Research", 
     role = c("cph", "fnd")))
-Depends: R (>= 4.0)
+Depends: R (>= 4.3)
 Description: Set of tools to read and manipulate various data formats for fisheries. Mainly
   catered towards scientific trawl survey sampling ('biotic') data, acoustic
   trawl data, and commercial fishing catch ('landings') data. Among the

NEWS.md

@@ -1,3 +1,7 @@
+# RstoxData v2.1.0  (2024-11-04)
+* Final release for StoX 4.1.0.
+
+
 # RstoxData v2.0.1-9006  (2024-10-30)
 * Fixed bug in asIntegerAfterRound() used when setting class of ICES data to avoid floating point to integer errors. The bug appeared when the input was character (but convertible to numeric). 
 

R/StoxExport.R

@@ -318,12 +318,14 @@ checkAndCreateICESAcousticCSV <- function(ICESAcousticDataOne) {
 
 
 is_online <- function(site = "https://raw.githubusercontent.com/StoXProject/repo/master/README.md") {
-	tryCatch({
-		readLines(site, n = 1)
-		TRUE
-	},
-	warning = function(w) invokeRestart("muffleWarning"),
-	error = function(e) FALSE)
+	tryCatch(
+		{
+			readLines(site, n = 1)
+			TRUE
+		},
+		warning = function(w) invokeRestart("muffleWarning"),
+		error = function(e) FALSE
+	)
 }
 
 

data-raw/prepUnits.R

@@ -39,6 +39,7 @@ StoxUnits <- rbind(StoxUnits, list("cardinality-N", "cardinality", "N", "individ
 StoxUnits <- rbind(StoxUnits, list("cardinality-kN", "cardinality", "kN", "10^3 individuals", "thousand individuals", 1e3))
 StoxUnits <- rbind(StoxUnits, list("cardinality-MN", "cardinality", "MN", "10^6 individuals", "million individuals", 1e6))
 StoxUnits <- rbind(StoxUnits, list("cardinality-GN", "cardinality", "GN", "10^9 individuals", "billion individuals", 1e9))
+StoxUnits <- rbind(StoxUnits, list("cardinality-TN", "cardinality", "TN", "10^12 individuals", "trillion individuals", 1e12))
 
 StoxUnits <- rbind(StoxUnits, list("area_number_density-N/nmi^2", "area_number_density", "N/nmi^2", "individuals/nmi^2", "individuals per square nautical mile", 1))
 StoxUnits <- rbind(StoxUnits, list("area_number_density-kN/nmi^2", "area_number_density", "kN/nmi^2", "10^3 individuals/nmi^2", "thousand individuals per square nautical mile", 1e3))