Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat update testing fixtures #88

Merged
merged 70 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
7a5184c
update test simple object to use r4ss simple_small
MOshima-PIFSC Jun 13, 2023
8034942
get ss in workflow and run retro
MOshima-PIFSC Jun 13, 2023
9458133
small fix
MOshima-PIFSC Jun 13, 2023
c3c5bc1
making get-ss a reproducible workflow
MOshima-PIFSC Jun 13, 2023
7be6db8
Note for branch name update later
MOshima-PIFSC Jun 13, 2023
cfaf41d
remove branch name
MOshima-PIFSC Jun 13, 2023
7528ccf
updating r-cmd-check
MOshima-PIFSC Jun 13, 2023
cd8afc8
remove old workflow call
MOshima-PIFSC Jun 13, 2023
0f528bf
update v1s to v2
MOshima-PIFSC Jun 14, 2023
5c08c24
add r shell
MOshima-PIFSC Jun 14, 2023
7c038ae
debug run retrospectives
MOshima-PIFSC Jun 14, 2023
9302ea0
more debug
MOshima-PIFSC Jun 14, 2023
c84634f
more debug
MOshima-PIFSC Jun 14, 2023
27a11c3
add cleanup
MOshima-PIFSC Jun 14, 2023
af8f778
remove all ss executables before running tests
MOshima-PIFSC Jun 14, 2023
27b9a73
minor fix
MOshima-PIFSC Jun 14, 2023
78c1309
change retroModels path
MOshima-PIFSC Jun 14, 2023
f3129a7
change test_fixtures path
MOshima-PIFSC Jun 14, 2023
7a709af
test-fixtures path
MOshima-PIFSC Jun 14, 2023
1e59e70
minor fix
MOshima-PIFSC Jun 14, 2023
2302cef
debug
MOshima-PIFSC Jun 14, 2023
e38f646
remove other os and test path
MOshima-PIFSC Jun 14, 2023
72e538e
minor fix
MOshima-PIFSC Jun 14, 2023
b297058
adding working directory
MOshima-PIFSC Jun 14, 2023
df5df0e
debug
MOshima-PIFSC Jun 14, 2023
67ec4fa
rm wd
MOshima-PIFSC Jun 14, 2023
59ee83b
refactoring tests
MOshima-PIFSC Jun 15, 2023
d597926
add r depends
MOshima-PIFSC Jun 15, 2023
b3d5803
put retro runs in data file
MOshima-PIFSC Jun 16, 2023
d08222c
change path to model_recipes
MOshima-PIFSC Jun 16, 2023
09a31df
run retrospectives in test
MOshima-PIFSC Jun 16, 2023
a3345c0
copy input files to test runs dir
MOshima-PIFSC Jun 16, 2023
e5c73d5
remove some steps
MOshima-PIFSC Jun 16, 2023
25fb2c2
mkdir
MOshima-PIFSC Jun 16, 2023
7e9da0c
debug
MOshima-PIFSC Jun 16, 2023
0f4751c
create inst/extdata folder
MOshima-PIFSC Jun 16, 2023
736a4c7
minor fix
MOshima-PIFSC Jun 16, 2023
d635ec2
add fullname
MOshima-PIFSC Jun 16, 2023
11986ce
minor fix
MOshima-PIFSC Jun 16, 2023
d04201c
update tests
MOshima-PIFSC Jun 16, 2023
b67e53a
clean up ss
MOshima-PIFSC Jun 16, 2023
ae68e2e
error on error only, pass for warnings
MOshima-PIFSC Jun 16, 2023
06c848d
minor fix to error-on
MOshima-PIFSC Jun 16, 2023
7125238
remove old call-r-cmd-check workflow
MOshima-PIFSC Jun 16, 2023
5076adc
testing workflow again
MOshima-PIFSC Jun 30, 2023
a4f3168
fix retro directory
MOshima-PIFSC Jun 30, 2023
287cdc9
add mac os
MOshima-PIFSC Jun 30, 2023
c22f61f
add get ss_osx
MOshima-PIFSC Jun 30, 2023
17330bf
adding windows to matrix config
MOshima-PIFSC Jun 30, 2023
6f2ab6a
small fix
MOshima-PIFSC Jun 30, 2023
cbc0d6f
change pwshll commands
MOshima-PIFSC Jun 30, 2023
756ba89
add outfile path
MOshima-PIFSC Jun 30, 2023
932c064
remove sudo cmd
MOshima-PIFSC Jun 30, 2023
9c7d13f
using configurator
MOshima-PIFSC Jun 30, 2023
e78362a
add cmds to configurator
MOshima-PIFSC Jun 30, 2023
29ea585
move ss.exe
MOshima-PIFSC Jun 30, 2023
bea4a03
debugging
MOshima-PIFSC Jun 30, 2023
5d20ec7
debug
MOshima-PIFSC Jun 30, 2023
ce55242
debug
MOshima-PIFSC Jun 30, 2023
b55c19b
debug
MOshima-PIFSC Jun 30, 2023
12db7fc
windows cleanup
MOshima-PIFSC Jun 30, 2023
c7c236e
full check
MOshima-PIFSC Jun 30, 2023
a5ee9f9
style and docs: run devtools::document() and styler::style_pkg()
MOshima-PIFSC Jun 30, 2023
5914793
add skip if for tests for retrospective checks #89
MOshima-PIFSC Jul 11, 2023
877a017
Merge branch 'FEAT-update-testing-fixtures' of https://github.com/PIF…
MOshima-PIFSC Jul 11, 2023
16bf563
fixing extra parentheses
MOshima-PIFSC Jul 11, 2023
bc2ac72
style and docs: run devtools::document() and styler::style_pkg()
MOshima-PIFSC Jul 11, 2023
bad3ef0
minor fix to if
MOshima-PIFSC Jul 11, 2023
0214a34
Merge branch 'FEAT-update-testing-fixtures' of https://github.com/PIF…
MOshima-PIFSC Jul 11, 2023
8a2f60a
style and docs: run devtools::document() and styler::style_pkg()
MOshima-PIFSC Jul 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
paths-ignore:
- 'README.md'
pull_request:

name: build-ss-R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: ubuntu-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3

- name: Get the latest SS3 executable for linux and move to expected location
if: matrix.config.os == 'ubuntu-latest'
run: |
curl https://api.github.com/repos/nmfs-stock-synthesis/stock-synthesis/releases/latest | grep "browser_download_url" | grep -Eo 'https://[^\"]*' | grep "ss_linux" | xargs wget
mv ss_linux ss
sudo chmod a+x ss
cp ss inst/extdata/ss
rm ss

- name: Get the latest SS3 executable for windows and move to expected location
if: matrix.config.os == 'windows-latest'
run: |
Invoke-WebRequest -Uri https://github.com/nmfs-stock-synthesis/stock-synthesis/releases/download/v3.30.21/ss_win.exe -Outfile "D:\a\ss3diags\ss3diags\ss_win.exe"
mv ss_win.exe ss.exe
cp ss.exe inst/extdata/ss.exe

- name: Get the latest SS3 executable for macOS and move to expected location
if: matrix.config.os == 'macOS-latest'
run: |
curl https://api.github.com/repos/nmfs-stock-synthesis/stock-synthesis/releases/latest | grep "browser_download_url" | grep -Eo 'https://[^\"]*' | grep "ss_osx" | xargs wget
mv ss_osx ss
sudo chmod a+x ss
cp ss inst/extdata/ss
rm ss

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::rcmdcheck
any::remotes

- uses: r-lib/actions/check-r-package@v2
with:
error-on: '"error"'

- name: remove ss executable
run: |
if ["$RUNNER_OS" == "Linux" ]; then
rm inst/extdata/ss.exe
else
rm inst/extdata/ss
fi
shell: bash






13 changes: 0 additions & 13 deletions .github/workflows/call-r-cmd-check.yml

This file was deleted.

74 changes: 29 additions & 45 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,41 @@ Package: ss3diags
Title: Stock Synthesis Model Diagnostics for Intergated Stock Assessments
Version: 2.1.1
Date: 2023-06-07
Authors@R:
c(person(given = "Henning",
family = "Winker",
role = c("aut"),
email = "henning.winker@ec.europa.eu"),
person(given = "Felipe",
family = "Carvalho",
role = c("aut"),
email = "felipe.carvalho@noaa.gov"),
person(given = "Massimiliano",
family = "Cardinale",
role = c("aut"),
email = "massimiliano.cardinale@slu.se"),
person(given = "Laurence",
family = "Kell",
role = c("aut"),
email = "laurie@seaplusplus.co.uk"),
person(given = "Megumi",
family = "Oshima",
role = c("aut","cre"),
email = "megumi.oshima@noaa.gov"),
person(given = "Eric",
family = "Fletcher",
role = c("aut"),
email = "eric.fletcher@noaa")
)
Description: Compilation of diagnostic functions for Stock Synthesis models, which
developed for the manuscript "Using Model Diagnostics in Integrated Stock Assessments".
Authors@R: c(
person("Henning", "Winker", , "henning.winker@ec.europa.eu", role = "aut"),
person("Felipe", "Carvalho", , "felipe.carvalho@noaa.gov", role = "aut"),
person("Massimiliano", "Cardinale", , "massimiliano.cardinale@slu.se", role = "aut"),
person("Laurence", "Kell", , "laurie@seaplusplus.co.uk", role = "aut"),
person("Megumi", "Oshima", , "megumi.oshima@noaa.gov", role = c("aut", "cre")),
person("Eric", "Fletcher", , "eric.fletcher@noaa", role = "aut")
)
Description: Compilation of diagnostic functions for Stock Synthesis
models, which developed for the manuscript "Using Model Diagnostics in
Integrated Stock Assessments".
License: EUPL
URL: https://github.com/PIFSCstockassessments/ss3diags
BugReports: https://github.com/PIFSCstockassessments/ss3diags/issues
Depends:
R (>= 3.5)
R (>= 3.5)
Imports:
reshape2,
mvtnorm,
randtests,
r4ss(>= 1.46.1),
dplyr,
gplots,
lifecycle,
magrittr,
dplyr,
rlang,
lifecycle
Remotes: r4ss/r4ss#821
License: EUPL
mvtnorm,
r4ss(>= 1.46.1),
randtests,
reshape2,
rlang
Suggests:
knitr,
markdown,
rmarkdown,
testthat (>= 3.0.0)
Remotes:
r4ss/r4ss#821
Encoding: UTF-8
LazyData: True
LazyDataCompression: gzip
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Suggests:
testthat (>= 3.0.0),
knitr,
rmarkdown,
markdown
URL: https://github.com/PIFSCstockassessments/ss3diags
BugReports: https://github.com/PIFSCstockassessments/ss3diags/issues
1 change: 1 addition & 0 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![R-CMD-check](https://github.com/r4ss/r4ss/workflows/R-CMD-check/badge.svg)](https://github.com/PIFSCstockassessments/ss3diags/actions)
[![R-CMD-check](https://github.com/PIFSCstockassessments/ss3diags/workflows/R-CMD-check/badge.svg)](https://github.com/PIFSCstockassessments/ss3diags/actions)
<!-- badges: end -->

### Build Status
Expand Down
Loading