Skip to content

Commit

Permalink
Merge pull request #961 from ThinkR-open/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ColinFay authored Mar 10, 2023
2 parents 7a9debb + 1e79e54 commit ce67fa5
Show file tree
Hide file tree
Showing 83 changed files with 2,406 additions and 1,381 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
^Meta$
^\.github$
^revdep$
README.html
49 changes: 49 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: 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: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

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

steps:
- uses: actions/checkout@v3

- 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
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
112 changes: 0 additions & 112 deletions .github/workflows/check-standard.yaml

This file was deleted.

78 changes: 27 additions & 51 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,70 +1,42 @@
Package: golem
Title: A Framework for Robust Shiny Applications
Version: 0.3.5.9001
Authors@R:
c(person(given = "Colin",
family = "Fay",
role = c("cre", "aut"),
email = "[email protected]",
comment = c(ORCID = "0000-0001-7343-1846")),
person(given = "Vincent",
family = "Guyader",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0003-0671-9270", "previous maintainer")),
person(given = "Sébastien",
family = "Rochette",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0002-1565-9313")),
person(given = "Cervan",
family = "Girard",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0002-4816-4624")),
person(given = "Novica",
family = "Nakov",
role = "ctb",
email = "[email protected]"),
person(given = "David",
family = "Granjon",
role = "ctb",
email = "[email protected]"),
person(given = "Arthur",
family = "Bréant",
role = "ctb",
email = "[email protected]"),
person(given = "Antoine",
family = "Languillaume",
role = "ctb",
email = "[email protected]"),
person(given = "ThinkR",
role = "cph"))
Version: 0.4.0
Authors@R: c(
person("Colin", "Fay", , "[email protected]", role = c("cre", "aut"),
comment = c(ORCID = "0000-0001-7343-1846")),
person("Vincent", "Guyader", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0003-0671-9270", "previous maintainer")),
person("Sébastien", "Rochette", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0002-1565-9313")),
person("Cervan", "Girard", , "[email protected]", role = "aut",
comment = c(ORCID = "0000-0002-4816-4624")),
person("Novica", "Nakov", , "[email protected]", role = "ctb"),
person("David", "Granjon", , "[email protected]", role = "ctb"),
person("Arthur", "Bréant", , "[email protected]", role = "ctb"),
person("Antoine", "Languillaume", , "[email protected]", role = "ctb"),
person("ThinkR", role = "cph")
)
Description: An opinionated framework for building a production-ready
'Shiny' application. This package contains a series of tools for
building a robust 'Shiny' application from start to finish.
License: MIT + file LICENSE
URL: https://github.com/ThinkR-open/golem
BugReports: https://github.com/ThinkR-open/golem/issues
Depends:
Depends:
R (>= 3.0)
Imports:
Imports:
attempt (>= 0.3.0),
cli (>= 2.0.0),
config,
crayon,
desc,
here,
fs,
htmltools,
rlang (>= 1.0.0),
rstudioapi,
shiny (>= 1.5.0),
usethis (>= 1.6.0),
utils,
yaml
Suggests:
covr,
cli (>= 2.0.0),
crayon,
devtools,
dockerfiler (>= 0.2.0),
knitr,
Expand All @@ -83,11 +55,15 @@ Suggests:
tools,
withr,
attachment (>= 0.2.5),
renv
VignetteBuilder:
renv,
usethis (>= 1.6.0),
fs,
rstudioapi,
desc
VignetteBuilder:
knitr
Config/testthat/edition: 3
Encoding: UTF-8
Language: en-US
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.1
RoxygenNote: 7.2.3
23 changes: 2 additions & 21 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export(invoke_js)
export(is_running)
export(js_handler_template)
export(js_template)
export(maintenance_page)
export(make_dev)
export(message_dev)
export(module_template)
Expand Down Expand Up @@ -91,33 +92,13 @@ importFrom(attempt,is_try_error)
importFrom(attempt,stop_if)
importFrom(attempt,stop_if_not)
importFrom(attempt,without_warning)
importFrom(cli,cat_bullet)
importFrom(cli,cat_line)
importFrom(cli,cat_rule)
importFrom(cli,cli_alert_info)
importFrom(config,get)
importFrom(desc,desc_get_deps)
importFrom(desc,description)
importFrom(htmltools,htmlDependency)
importFrom(rstudioapi,documentSaveAll)
importFrom(rstudioapi,getSourceEditorContext)
importFrom(rstudioapi,hasFun)
importFrom(rstudioapi,isAvailable)
importFrom(rstudioapi,modifyRange)
importFrom(rstudioapi,navigateToFile)
importFrom(rstudioapi,openProject)
importFrom(rstudioapi,sourceMarkers)
importFrom(shiny,addResourcePath)
importFrom(shiny,getShinyOption)
importFrom(shiny,htmlTemplate)
importFrom(shiny,includeScript)
importFrom(shiny,tags)
importFrom(usethis,create_project)
importFrom(usethis,proj_set)
importFrom(usethis,use_build_ignore)
importFrom(usethis,use_latest_dependencies)
importFrom(usethis,use_package)
importFrom(usethis,use_spell_check)
importFrom(usethis,use_testthat)
importFrom(utils,capture.output)
importFrom(utils,file.edit)
importFrom(utils,getFromNamespace)
Expand Down
Loading

0 comments on commit ce67fa5

Please sign in to comment.