Skip to content

Commit 4d4da83

Browse files
authored
Merge pull request #170 from NOAA-EDAB/dev
sync `dev` and `main`
2 parents 5800b29 + 504c8b0 commit 4d4da83

50 files changed

Lines changed: 10414 additions & 6053 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/verify_pr.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Run PR Checks
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
7+
jobs:
8+
check_description:
9+
runs-on: ubuntu-latest
10+
name: Verify DESCRIPTION Updated
11+
steps:
12+
- name: Verify DESCRIPTION Updated
13+
uses: takanuva15/verify-file-updated@v1
14+
with:
15+
filename_to_check: DESCRIPTION

DESCRIPTION

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: placeholder
22
Type: Book
33
Title: Technical Documentation, State of the Ecosystem Report
44
Description: Technical documentation for State of the Ecosystem Reporting.
5-
Version: 2026.0.0
5+
Version: 7.0.0
66
Depends:
77
bookdown,
88
rmarkdown,
@@ -14,9 +14,11 @@ Depends:
1414
kableExtra,
1515
ecodata,
1616
stocksmart,
17-
DT
17+
DT,
18+
formatR
1819
Remotes:
1920
NOAA-EDAB/ecodata@dev,
2021
NOAA-EDAB/stocksmart
2122

2223

24+

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# tech-doc
22

33
[![build-book](https://github.com/NOAA-EDAB/tech-doc/actions/workflows/bookdown.yaml/badge.svg)](https://github.com/NOAA-EDAB/tech-doc/actions/workflows/bookdown.yaml)
4-
![gitleaks](https://github.com/NOAA-EDAB/tech-doc/workflows/gitleaks/badge.svg)
4+
[![gitleaks](https://github.com/NOAA-EDAB/tech-doc/workflows/gitleaks/badge.svg)
5+
[![Run PR Checks](https://github.com/NOAA-EDAB/tech-doc/actions/workflows/verify_pr.yml/badge.svg)](https://github.com/NOAA-EDAB/tech-doc/actions/workflows/verify_pr.yml)
56

67
Technical documentation for State of the Ecosystem indicators and general methods.
78

_404.Rmd

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
**The following pages have been moved or renamed**
55

6-
- [Bottom Temperature - in situ](https://noaa-edab.github.io/catalog/bottom_temp_insitu.html)
7-
- [Bottom Temperature - Seasonal Anomaly](https://noaa-edab.github.io/catalog/bottom_temp_model_anom.html)
8-
- [Bottom Temperature - Seasonal Gridded](https://noaa-edab.github.io/catalog/bottom_temp_model_gridded.html)
9-
- [Cetacean Distribution Shifts](https://noaa-edab.github.io/catalog/cetacean_dist.html)
10-
- [Thermal Habitat Persistence](https://noaa-edab.github.io/catalog/thermal_habitat_gridded.html)
11-
- [Seasonal OISST Anomaly Map](https://noaa-edab.github.io/catalog/seasonal_oisst_anom_gridded.html)
6+
- [Bottom Temperature - in situ](https://noaa-edab.github.io/tech-doc/bottom_temp_insitu.html)
7+
- [Bottom Temperature - Seasonal Anomaly](https://noaa-edab.github.io/tech-doc/bottom_temp_model_anom.html)
8+
- [Bottom Temperature - Seasonal Gridded](https://noaa-edab.github.io/tech-doc/bottom_temp_model_gridded.html)
9+
- [Calanus Variation - WBTS](https://noaa-edab.github.io/tech-doc/wbts_zoo.html)
10+
- [Cetacean Distribution Shifts](https://noaa-edab.github.io/tech-doc/cetacean_dist.html)
11+
- [Mesozooplankton Biomass - WBTS](https://noaa-edab.github.io/tech-doc/wbts_zoo.html)
12+
- [Thermal Habitat Persistence](https://noaa-edab.github.io/tech-doc/thermal_habitat_gridded.html)
13+
- [Seasonal OISST Anomaly Map](https://noaa-edab.github.io/tech-doc/seasonal_oisst_anom_gridded.html)
1214

1315
**If the page you are looking for is not listed above, please refer to the Table of Contents to the left. If you are having trouble finding something, please email Brandon Beltz (brandon.beltz@noaa.gov) for assistance.**

_bookdown.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ rmd_files:
2323
- "chapters/habs.Rmd"
2424
- "chapters/SAV.Rmd"
2525
- "chapters/zooplankton_index.Rmd"
26-
- "chapters/calanus_variation.Rmd"
27-
- "chapters/wbts_mesozooplankton.Rmd"
26+
- "chapters/wbts_zoo.Rmd"
27+
- "chapters/preyfield_energy.Rmd"
2828
- "chapters/zoo_abundance_anom.Rmd"
2929
#- "chapters/zoo_diversity.Rmd" *Missing tech doc page
3030
#
@@ -34,8 +34,8 @@ rmd_files:
3434
- "chapters/aggregate_biomass.rmd"
3535
- "chapters/survey_shannon.rmd"
3636
- "chapters/mab_inshore_survey.Rmd"
37-
#- "chapters/mass_inshore_survey.Rmd" *Shares tech doc page with mab_inshore_survey
38-
#- "chapters/ne_inshore_survey.Rmd" *Shares tech doc page with mab_inshore_survey
37+
- "chapters/ne_inshore_survey.Rmd"
38+
- "chapters/mass_inshore_survey.Rmd"
3939
#- "chapters/osw_survey_impact.Rmd" *Missing tech doc page
4040
- "chapters/condition.Rmd"
4141
- "chapters/finfish_traits.Rmd"
@@ -44,6 +44,7 @@ rmd_files:
4444
- "chapters/energy_density.Rmd"
4545
- "chapters/spawn_timing.Rmd"
4646
- "chapters/exp_n.Rmd"
47+
- "chapters/effective_sweptarea.Rmd"
4748
- "chapters/forage_index.Rmd"
4849
- "chapters/benthos_index.Rmd"
4950
- "chapters/harborporpoise.Rmd"
@@ -65,7 +66,7 @@ rmd_files:
6566
# #################### OCEANOGRAPHIC ##################
6667
- "chapters/sectionHeaders/oceanographic.rmd"
6768
- "chapters/bottom_temp_insitu.Rmd"
68-
#- "chapters/bottom_temp_model_anom.Rmd" *Missing tech doc page
69+
- "chapters/bottom_temp_model_anom.Rmd"
6970
- "chapters/bottom_temp_model_gridded.Rmd"
7071
- "chapters/seasonal_oisst_anom_gridded.Rmd"
7172
#- "chapters/seasonal_oisst_anom.Rmd" *Missing tech doc page
@@ -77,13 +78,16 @@ rmd_files:
7778
- "chapters/slopewater.Rmd"
7879
- "chapters/persistent_hotspots.Rmd"
7980
- "chapters/wcr.Rmd"
80-
#- "chapters/thermal_habitat_area.Rmd" *Missing tech doc page
81-
#- "chapters/thermal_habitat_persistence.Rmd" *Missing tech doc page
81+
- "chapters/advection.Rmd"
82+
- "chapters/thermal_habitat_area.Rmd"
83+
- "chapters/thermal_habitat_gridded.Rmd"
8284
- "chapters/ch_bay_sal.Rmd"
8385
- "chapters/ch_bay_temp.Rmd"
8486
- "chapters/ches_bay_sst.Rmd"
8587
#- "chapters/ches_bay_synthesis.Rmd" *Missing tech doc page
8688
- "chapters/heatwave.Rmd"
89+
- "chapters/cold_spell.Rmd"
90+
- "chapters/MOM6_forecasts.Rmd"
8791
#- "chapters/heatwave_year.Rmd" *Shares tech doc page with heatwave
8892
#- "chapters/timing_shifts.Rmd" *Missing tech doc page
8993
#- "chapters/observation_synthesis.Rmd" *Missing tech doc page
@@ -94,6 +98,7 @@ rmd_files:
9498
# ######################## ECONOMIC ##################
9599
- "chapters/sectionHeaders/economic.rmd"
96100
- "chapters/comdat.Rmd"
101+
- "chapters/comdat_profit.Rmd"
97102
- "chapters/commercial_div.Rmd"
98103
- "chapters/ppr.Rmd"
99104
- "chapters/recdat.Rmd"
@@ -103,6 +108,7 @@ rmd_files:
103108
- "chapters/stock_status.Rmd"
104109
- "chapters/engagement.Rmd"
105110
#- "chapters/community_climate_vulnerability.Rmd" *Missing tech doc page
111+
- "chapters/crew_survey.Rmd"
106112
- "chapters/aquaculture.Rmd"
107113
- "chapters/Wind_dev_speed.Rmd"
108114
- "chapters/wind_port.Rmd"
@@ -113,7 +119,6 @@ rmd_files:
113119
- "chapters/sectionHeaders/legacy.rmd"
114120
- "chapters/regime_shift_analysis.Rmd"
115121
- "chapters/Annual_SST_cycle_indicator.Rmd"
116-
- "chapters/bottom_temperature_GLORYS.Rmd"
117122
- "chapters/calanus_stage.Rmd"
118123
#- "chapters/forage_anomaly.Rmd"
119124
- "chapters/occupancy_indicator.Rmd"
@@ -135,6 +140,11 @@ rmd_files:
135140
- "chapters/observer_data_indicator.Rmd"
136141
- "chapters/Seabird_MAB.Rmd"
137142
- "chapters/wind_habitat_occupancy.Rmd"
143+
#
144+
#
145+
# #################### RESOURCES ##################
146+
- "chapters/sectionHeaders/resources.rmd"
147+
- "chapters/changelog.Rmd"
138148
- "chapters/references.Rmd"
139149
before_chapter_script: _common.R
140150
delete_merged_file: true

0 commit comments

Comments
 (0)