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

Release for v1.0 #103

Draft
wants to merge 51 commits into
base: main
Choose a base branch
from
Draft
Changes from 2 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
45d5e63
fix(create_template):
sbreitbart-NOAA Dec 12, 2024
3a33a9b
Updated warnings for missing rda_dir, then changed end_year definitio…
sbreitbart-NOAA Dec 12, 2024
76d341f
moving commits from dev to dev-1.0 (minor typo fix; updating authors …
sbreitbart-NOAA Dec 12, 2024
b201a5a
moving commits from dev to dev-1.0 (adding new fish images)
sbreitbart-NOAA Dec 12, 2024
ecf10de
Removed captions_alt_text_template.csv because it's not used in asar.…
sbreitbart-NOAA Dec 12, 2024
acf482b
changed eval for first chunk to true, and eval for indices table setu…
sbreitbart-NOAA Dec 12, 2024
454cf52
style and docs: run devtools::document() and styler::style_pkg() (#98)
github-actions[bot] Dec 12, 2024
94eb5c7
Merge pull request #101 from nmfs-ost/fix-cr_temp
sbreitbart-NOAA Dec 12, 2024
2b9a914
update(create_template): removed make_rda parameter and updated docum…
sbreitbart-NOAA Dec 12, 2024
0fda2ac
update(create_template):
sbreitbart-NOAA Dec 12, 2024
c134ae4
fix(cover image): allow the spp_image path to properly function and a…
Schiano-NOAA Dec 12, 2024
f901b49
fix(create_template): added back check for null resdir and model_resu…
sbreitbart-NOAA Dec 13, 2024
29e8815
Update(test-create_template): reflect changes with fxn that interacts…
Schiano-NOAA Dec 13, 2024
5c4a855
Add remaining fish images found in NOAA species directory from list h…
sbreitbart-NOAA Dec 13, 2024
99657f3
Merge branch 'dev-1.0' of https://github.com/nmfs-ost/asar into dev-1.0
sbreitbart-NOAA Dec 13, 2024
41c6ac4
Added species images from the PFMC documents repository: https://www.…
sbreitbart-NOAA Dec 13, 2024
38a1682
Added species images from the PIFSC google drive folder
sbreitbart-NOAA Dec 16, 2024
377339d
added first draft of new FSC-specific citations
sbreitbart-NOAA Dec 17, 2024
de47142
Bracketed information that must be added by authors into citation. Up…
sbreitbart-NOAA Dec 17, 2024
58e5772
Merge pull request #107 from nmfs-ost/update-citations
sbreitbart-NOAA Dec 17, 2024
84742da
Added new species images and updated existing image names
sbreitbart-NOAA Dec 18, 2024
ec3ec7c
Changed names of species images as per suggestions from @marcnadon ht…
sbreitbart-NOAA Dec 18, 2024
e8bb754
Added '!expr' before captions and alt tex objects in chunk options fo…
sbreitbart-NOAA Dec 18, 2024
1ea4372
Update(call-r-cmd-check): change to pushes and PRs to main branch
Schiano-NOAA Dec 18, 2024
ca6a972
fix previous commit for check cmd
Schiano-NOAA Dec 18, 2024
9078df5
change testthat parallel option to be false (#109)
k-doering-NOAA Dec 18, 2024
0b3e0e5
Changed create figures/tables docs to check if an rda is present; if …
sbreitbart-NOAA Dec 19, 2024
fe926da
update DESCRIPTION to overcome ubuntu error
sbreitbart-NOAA Dec 19, 2024
365b1b8
Removed captions_alt_text_template.csv because it's not used in asar.…
sbreitbart-NOAA Dec 12, 2024
31c544b
changed eval for first chunk to true, and eval for indices table setu…
sbreitbart-NOAA Dec 12, 2024
661aebb
fix(create_template):
sbreitbart-NOAA Dec 12, 2024
a1f4c46
Updated warnings for missing rda_dir, then changed end_year definitio…
sbreitbart-NOAA Dec 12, 2024
299dd21
moving commits from dev to dev-1.0 (minor typo fix; updating authors …
sbreitbart-NOAA Dec 12, 2024
b1e3092
moving commits from dev to dev-1.0 (adding new fish images)
sbreitbart-NOAA Dec 12, 2024
03a12db
update(create_template):
sbreitbart-NOAA Dec 12, 2024
97a74a3
fix(create_template): added back check for null resdir and model_resu…
sbreitbart-NOAA Dec 13, 2024
7c2e41a
Add remaining fish images found in NOAA species directory from list h…
sbreitbart-NOAA Dec 13, 2024
44867be
Update(test-create_template): reflect changes with fxn that interacts…
Schiano-NOAA Dec 13, 2024
e24e721
Added species images from the PFMC documents repository: https://www.…
sbreitbart-NOAA Dec 13, 2024
8aaba5a
Added species images from the PIFSC google drive folder
sbreitbart-NOAA Dec 16, 2024
b826826
added first draft of new FSC-specific citations
sbreitbart-NOAA Dec 17, 2024
e8f2e6b
Bracketed information that must be added by authors into citation. Up…
sbreitbart-NOAA Dec 17, 2024
6900c70
Added new species images and updated existing image names
sbreitbart-NOAA Dec 18, 2024
e55d5e4
Changed names of species images as per suggestions from @marcnadon ht…
sbreitbart-NOAA Dec 18, 2024
aedf766
Added '!expr' before captions and alt tex objects in chunk options fo…
sbreitbart-NOAA Dec 18, 2024
f3e6532
Merge branch 'dev-1.0' of https://github.com/nmfs-ost/asar into dev-1.0
sbreitbart-NOAA Dec 19, 2024
aff189b
Changed create figures/tables docs to check if an rda is present; if …
sbreitbart-NOAA Dec 19, 2024
5127f8d
Merge branch 'render-wo-rda' of https://github.com/nmfs-ost/asar into…
sbreitbart-NOAA Dec 19, 2024
7017d6d
added "include" chunk parameter to tables file to ensure non-evaluate…
sbreitbart-NOAA Dec 19, 2024
bb0ed28
Merge pull request #110 from nmfs-ost/render-wo-rda
sbreitbart-NOAA Dec 20, 2024
efbc05e
fix(create-_template): move convert_output option so code is linear
Schiano-NOAA Dec 23, 2024
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
30 changes: 15 additions & 15 deletions tests/testthat/test-create_template.R
Original file line number Diff line number Diff line change
@@ -84,10 +84,10 @@ test_that("create_template() creates correct files", {
year = year,
author = c("John Snow", "Danny Phantom", "Patrick Star"),
include_affiliation = TRUE,
parameters = FALSE,
resdir = "data",
model_results = "Report.sso",
model = "SS3"
parameters = FALSE
# resdir = "data",
# model_results = "Report.sso",
# model = "SS3"
)

long_inputs_output_path <- file.path(path, "report")
@@ -165,10 +165,10 @@ test_that("warning is triggered for existing files", {
year = 2010,
author = c("John Snow", "Danny Phantom", "Patrick Star"),
include_affiliation = TRUE,
parameters = FALSE,
resdir = "data",
model_results = "Report.sso",
model = "SS3"
parameters = FALSE
# resdir = "data",
# model_results = "Report.sso",
# model = "SS3"
)

# Test if warning is triggered when there are existing files in the provided location
@@ -188,10 +188,10 @@ test_that("warning is triggered for existing files", {
year = 2010,
author = c("John Snow", "Danny Phantom", "Patrick Star"),
include_affiliation = TRUE,
parameters = FALSE,
resdir = "data",
model_results = "Report.sso",
model = "SS3"
parameters = FALSE
# resdir = "data",
# model_results = "Report.sso",
# model = "SS3"
),
regexp = "There are files in this location."
)
@@ -220,9 +220,9 @@ test_that("file_dir works", {
author = c("John Snow", "Danny Phantom", "Patrick Star"),
include_affiliation = TRUE,
parameters = FALSE,
resdir = "data",
model_results = "Report.sso",
model = "SS3",
# resdir = "data",
# model_results = "Report.sso",
# model = "SS3",
file_dir = dir
)

Loading