Skip to content

Commit

Permalink
Merge pull request #374 from StoXProject/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
arnejohannesholmin authored Nov 4, 2024
2 parents e1ca7b9 + 64b02c5 commit a6d2edf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/check-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,6 @@ jobs:
brew install gdal udunits
shell: bash

- name: Install system dependencies on Linux
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
- name: Prepare for CRANdependencies on Linux
if: runner.os == 'Linux'
run: |
Expand Down
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: RstoxBase
Version: 2.0.1-9005
Date: 2024-10-31
Version: 2.1.0
Date: 2024-11-04
Title: Base StoX Functions
Authors@R: c(
person(given = "Arne Johannes",
Expand Down Expand Up @@ -33,7 +33,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: Base StoX functions used for survey estimation.
URL: https://github.com/StoXProject/RstoxBase
BugReports: https://github.com/StoXProject/RstoxBase/issues
Expand All @@ -47,7 +47,7 @@ Imports:
jsonlite (>= 1.6),
lwgeom (>= 0.2-0),
maps (>= 0.2-0),
RstoxData (>= 2.0.1-9007),
RstoxData (>= 2.1.0),
sf (>= 0.9.0),
stringi (>= 1.4.0),
units (>= 0.7),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# RstoxBase v2.1.0 (2024-11-04)
* Final release for StoX 4.1.0.


# RstoxBase v2.0.1-9005 (2024-10-30)
* Applied 'release' and 'oldrel' in the check-full.yaml, securing that binaries are built for the current and previous R minor versjon.
* Fixed bug with numeric vectors with NAs in factorNAfirst().
Expand Down

0 comments on commit a6d2edf

Please sign in to comment.