Skip to content

Commit

Permalink
Merge pull request #75 from JGCRI/redesign
Browse files Browse the repository at this point in the history
Hector v3.0
  • Loading branch information
stephpenn1 authored Jun 5, 2024
2 parents 0b9b4ec + 52d9566 commit 12160d7
Show file tree
Hide file tree
Showing 113 changed files with 5,872 additions and 18,574 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

name: docs

Expand All @@ -16,9 +14,9 @@ jobs:
steps:
- uses: actions/checkout@v2

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

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

- name: Install libcurl
run: brew install openssl curl
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rcmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: '3.6.1'}
- {os: macos-latest, r: '4.3.2'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}

steps:
- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2
- uses: actions/checkout@v2
- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2

- name: Install dependencies
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: '3.6.1'}
- {os: macos-latest, r: '4.3.2'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}

steps:

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

- name: Install dependencies
env:
Expand Down
14 changes: 5 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Type: Package
Title: A web-based interactive scenario builder and visualization application for the Hector climate model
Version: 2.0
Authors@R: c(person("Stephanie", "Pennington", email = "[email protected]", role = c("aut", "cre")),
person("Ciara", "Donegan", email = "[email protected]", role = "aut"),
person("Chris", "Vernon", email = "[email protected]", role = "aut"),
person("Stephanie", "Waldhoff", email = "[email protected]", role = "aut"),
person("Abigail", "Snyder", email = "[email protected]", role = "aut"),
Expand All @@ -14,10 +15,8 @@ License: GPL-3
Encoding: UTF-8
LazyData: true
Imports:
maps,
remotes,
shiny,
shinyjs,
devtools,
dplyr,
plotly,
Expand All @@ -26,20 +25,17 @@ Imports:
shinyBS,
shinythemes,
shinyWidgets,
stringr,
shinycustomloader,
markdown
stringr
Depends:
R (>= 3.6.0),
hector,
fldgen
hector (>= 3.2.0)
Suggests:
testthat (>= 2.1.0),
knitr,
rmarkdown,
pkgdown
Remotes:
github::JGCRI/hector,
github::JGCRI/hector@v3.2.0,
github::JGCRI/[email protected]
RoxygenNote: 7.1.1
RoxygenNote: 7.3.1
VignetteBuilder: knitr
18 changes: 2 additions & 16 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
# Generated by roxygen2: do not edit by hand

export(get_globalCapabilities)
export(get_globalColorScales)
export(get_globalParameters)
export(get_globalParamsCESM1BGC)
export(get_globalParamsCanESM2)
export(get_globalParamsDefault)
export(get_globalParamsGFDLESM2G)
export(get_globalParamsMIROCESM)
export(get_globalParamsMPIESMLR)
export(get_globalParamsMRIESM1)
export(get_globalPrecipPatterns)
export(get_globalScenarioColors)
export(get_globalScenarios)
export(get_globalTempPatterns)
export(get_globalVars)
export(get_rcps)
export(get_scenarios)
export(get_titles)
Loading

0 comments on commit 12160d7

Please sign in to comment.