Merge pull request #310 from StoXProject/StoX4

StoX 4.1.2-9002 See NEWS.md
StoXProject · Jan 17, 2025 · 5aec50d · 5aec50d
2 parents 73f0dbf + 88776de
commit 5aec50d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,13 @@
+# StoX v4.1.2-9002 (2025-01-17)
+
+## Summary
+* The StoX version 4.1.2-9002 is a pre-release to the patch release 4.1.2. The main change from StoX 4.1.2-9001 is that RstoxData is also released as a pre-release, which was needed given the current release process.
+
+## Detailed changes
+* Improved warning when multiple serial numbers have the same station in NMDBiotic input files.
+* Updated documentation on LengthDependentLengthDistributionCompensation with equations.
+
+
 # StoX v4.1.2-9001 (2025-01-12)
 
 ## Summary

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stox",
-  "version": "4.1.2-9001",
+  "version": "4.1.2-9002",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "StoX",
   "productName": "StoX",
-  "version": "4.1.2-9001",
+  "version": "4.1.2-9002",
   "description": "StoX: An open source software for marine survey analyses",
   "main": "build/index.js",
   "scripts": {

diff --git a/srv/OfficialRstoxFrameworkVersions.txt b/srv/OfficialRstoxFrameworkVersions.txt
@@ -83,3 +83,4 @@ StoX	RstoxFramework	Dependencies	OptionalDependencies	Official	Date
 4.1.1-9001	4.1.1-9003	RstoxBase_2.1.1-9001,RstoxData_2.1.1-9001	RstoxFDA_1.5.0-9002	FALSE	2024-12-19
 4.1.1	4.1.1	RstoxBase_2.1.1,RstoxData_2.1.1	RstoxFDA_1.3.0	TRUE	2024-12-20
 4.1.2-9001	4.1.2-9001	RstoxBase_2.1.2-9001,RstoxData_2.1.1	RstoxFDA_1.3.0	FALSE	2025-01-10
+4.1.2-9002	4.1.2-9002	RstoxBase_2.1.2-9002,RstoxData_2.1.2-9001	RstoxFDA_1.5.0-9002	FALSE	2025-01-16
diff --git a/srv/StoXGUIInternal.R b/srv/StoXGUIInternal.R
@@ -76,10 +76,10 @@ installOfficialRstoxPackagesWithDependencies <- function(
     # Get the R version as two digit string:
     twoDigitRVersion <- getTwoDigitRVersionForDownload(Rstox.repos = Rstox.repos)
 
-    # Get the package tables from the Rstox 
+    # Get the package tables from CRAN:  
     dependency.contriburl <- contrib.url(dependency.repos, type = "source")
     dependency.available <- utils::available.packages(dependency.contriburl)
-    # ... and the CRAN repo, 
+    # Get the package tables from the Rstox official repo:  
     Rstox.contriburl <- contrib.url(Rstox.repos, type = "source")
     Rstox.available <- utils::available.packages(Rstox.contriburl)
     # ... and rbind to one table to be used in package_dependencies: