Skip to content

Commit

Permalink
Merge branch 'release/0.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
morungos committed Nov 14, 2023
2 parents 80fb6d2 + af761a6 commit fc8a78a
Show file tree
Hide file tree
Showing 54 changed files with 40,461 additions and 720,693 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
mv $TEMP_DIR/external/example_external_data $TEMP_DIR/external/data
cp -R information/AMAP $TEMP_DIR/external/
mv $TEMP_DIR/external/AMAP $TEMP_DIR/external/information
mv $TEMP_DIR/external/information/README*.* $TEMP_DIR/external/
cd $TEMP_DIR
zip -r $WORK_DIR/docs/external.zip external
cd $WORK_DIR
Expand All @@ -69,6 +70,7 @@ jobs:
mv $TEMP_DIR/ospar/example_OSPAR $TEMP_DIR/ospar/data
cp -R information/OSPAR_2022 $TEMP_DIR/ospar/
mv $TEMP_DIR/ospar/OSPAR_2022 $TEMP_DIR/ospar/information
mv $TEMP_DIR/ospar/information/README*.* $TEMP_DIR/ospar/
cd $TEMP_DIR
zip -r $WORK_DIR/docs/ospar.zip ospar
cd $WORK_DIR
Expand All @@ -81,6 +83,7 @@ jobs:
mv $TEMP_DIR/helcom/example_HELCOM $TEMP_DIR/helcom/data
cp -R information/HELCOM_2023 $TEMP_DIR/helcom/
mv $TEMP_DIR/helcom/HELCOM_2023 $TEMP_DIR/helcom/information
mv $TEMP_DIR/helcom/information/README*.* $TEMP_DIR/helcom/
cd $TEMP_DIR
zip -r $WORK_DIR/docs/helcom.zip helcom
cd $WORK_DIR
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ R CMD check --no-manual harsat_x.y.z+1.tar.gz
git add DESCRIPTION
git commit -m "Updated version to x.y.z+1
git flow release finish x.y.z+1
git checkout master
git checkout main
git push
git push --tags
git push upstream
Expand Down
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: harsat
Title: Harmonized Regional Seas Assessment Tool
Version: 0.1.2
Version: 0.1.3.1003
Authors@R: c(
person(given = "Arctic Monitoring and Assessment Programme (AMAP)", email = "[email protected]", role = c("cph", "fnd", "aut")),
person(given = "Helsinki Commission (HELCOM)", email = "[email protected]", role = c("cph", "fnd", "aut")),
Expand Down Expand Up @@ -36,7 +36,9 @@ Imports:
stringr,
tibble,
tidyr,
sf
sf,
digest,
readxl
Suggests:
knitr,
rmarkdown,
Expand Down
7 changes: 4 additions & 3 deletions R/graphics_functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,11 @@ plot_assessment <- function(
# get file name from id, and add country and station name
# for easier identification

output_id <- gsub(
series$station_code,
output_id <- sub(
series$station_code,
paste(series$station_code, series$country, series$station_name),
id
id,
fixed=TRUE
)


Expand Down
276 changes: 0 additions & 276 deletions R/import_external_data.R

This file was deleted.

Loading

0 comments on commit fc8a78a

Please sign in to comment.