Skip to content

Commit

Permalink
Merge pull request #1163 from ThinkR-open/dev
Browse files Browse the repository at this point in the history
v 0.5.0 release
  • Loading branch information
ColinFay authored Aug 16, 2024
2 parents 365a5cc + fbfa10f commit 5fba0b3
Show file tree
Hide file tree
Showing 164 changed files with 7,012 additions and 2,630 deletions.
4 changes: 3 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@
^Meta$
^\.github$
^revdep$
README.html
README.html
^CRAN-SUBMISSION$
^dev$
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, master, dev]
pull_request:
branches: [main, master]
branches: [main, master, dev]

name: R-CMD-check

Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/recheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
on:
workflow_dispatch:
inputs:
which:
type: choice
description: Which dependents to check
options:
- strong
- most

name: Reverse dependency check

jobs:
revdep_check:
name: Reverse check ${{ inputs.which }} dependents
uses: r-devel/recheck/.github/workflows/recheck.yml@v1
with:
which: ${{ inputs.which }}
48 changes: 48 additions & 0 deletions .github/workflows/render-rmarkdown-and-bump-version.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# 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

# Controls when the action will run: for now dev and master
on:
push:
branches: [main, master, dev,test-for-gh]

name: render-rmarkdown

jobs:
render-rmarkdown:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
# Checks-out golem repo so the job can access it
- name: Checkout repo
uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: r-lib/actions/setup-pandoc@v2
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

# install linux packages
- name: install linux packages
run: sudo apt-get install -y libgit2-dev
# install CRAN packages used inside README.Rmd
- name: install required packages
run: Rscript -e 'install.packages("remotes");remotes::install_cran(c("rmarkdown", "covr", "gert", "knitr", "devtools", "desc"), repos = "https://packagemanager.posit.co/cran/__linux__/jammy/latest")'

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

# Render READEME.md using rmarkdown
- name: render README
run: Rscript -e 'rmarkdown::render("README.Rmd", output_format = "md_document")'
- name: Commit Results
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
git add README.md DESCRIPTION
git commit -m "Re-build README.md" || echo "No changes to commit"
git push origin || echo "No changes to commit"
95 changes: 95 additions & 0 deletions .github/workflows/rhub.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# R-hub's generic GitHub Actions workflow file. It's canonical location is at
# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
# You can update this file to a newer version using the rhub2 package:
#
# rhub::rhub_setup()
#
# It is unlikely that you need to modify this file manually.

name: R-hub
run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"

on:
workflow_dispatch:
inputs:
config:
description: 'A comma separated list of R-hub platforms to use.'
type: string
default: 'linux,windows,macos'
name:
description: 'Run name. You can leave this empty now.'
type: string
id:
description: 'Unique ID. You can leave this empty now.'
type: string

jobs:

setup:
runs-on: ubuntu-latest
outputs:
containers: ${{ steps.rhub-setup.outputs.containers }}
platforms: ${{ steps.rhub-setup.outputs.platforms }}

steps:
# NO NEED TO CHECKOUT HERE
- uses: r-hub/actions/setup@v1
with:
config: ${{ github.event.inputs.config }}
id: rhub-setup

linux-containers:
needs: setup
if: ${{ needs.setup.outputs.containers != '[]' }}
runs-on: ubuntu-latest
name: ${{ matrix.config.label }}
strategy:
fail-fast: false
matrix:
config: ${{ fromJson(needs.setup.outputs.containers) }}
container:
image: ${{ matrix.config.container }}

steps:
- uses: r-hub/actions/checkout@v1
- uses: r-hub/actions/platform-info@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/setup-deps@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/run-check@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}

other-platforms:
needs: setup
if: ${{ needs.setup.outputs.platforms != '[]' }}
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.label }}
strategy:
fail-fast: false
matrix:
config: ${{ fromJson(needs.setup.outputs.platforms) }}

steps:
- uses: r-hub/actions/checkout@v1
- uses: r-hub/actions/setup-r@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
- uses: r-hub/actions/platform-info@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/setup-deps@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
- uses: r-hub/actions/run-check@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.4.0
Date: 2023-03-10 13:02:19 UTC
SHA: ce67fa5e76d40f1ca68b6dda10064bae37fbcb6e
33 changes: 20 additions & 13 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: golem
Title: A Framework for Robust Shiny Applications
Version: 0.4.0
Version: 0.5.0
Authors@R: c(
person("Colin", "Fay", , "[email protected]", role = c("cre", "aut"),
comment = c(ORCID = "0000-0001-7343-1846")),
Expand All @@ -14,13 +14,14 @@ Authors@R: c(
person("David", "Granjon", , "[email protected]", role = "ctb"),
person("Arthur", "Bréant", , "[email protected]", role = "ctb"),
person("Antoine", "Languillaume", , "[email protected]", role = "ctb"),
person("Ilya", "Zarubin", , "[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
URL: https://thinkr-open.github.io/golem/, https://github.com/ThinkR-open/golem
BugReports: https://github.com/ThinkR-open/golem/issues
Depends:
R (>= 3.0)
Expand All @@ -34,36 +35,42 @@ Imports:
utils,
yaml
Suggests:
covr,
attachment (>= 0.3.2),
callr,
cli (>= 2.0.0),
covr,
crayon,
desc,
devtools,
dockerfiler (>= 0.2.0),
fs,
httpuv,
knitr,
pkgload,
mockery,
pkgbuild,
pkgdown,
pkgload (>= 1.3.0),
processx,
purrr,
rcmdcheck,
roxygen2,
remotes,
renv,
rmarkdown,
roxygen2,
rsconnect,
rstudioapi,
sass,
spelling,
stringr,
testthat,
testthat (>= 3.0.0),
tools,
withr,
attachment (>= 0.2.5),
renv,
usethis (>= 1.6.0),
fs,
rstudioapi,
desc
withr
VignetteBuilder:
knitr
Config/testthat/edition: 3
Config/testthat/parallel: true
Encoding: UTF-8
Language: en-US
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
11 changes: 11 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export(add_dockerfile_shinyproxy)
export(add_dockerfile_with_renv)
export(add_dockerfile_with_renv_heroku)
export(add_dockerfile_with_renv_shinyproxy)
export(add_empty_file)
export(add_fct)
export(add_html_template)
export(add_js_file)
Expand All @@ -16,7 +17,10 @@ export(add_js_input_binding)
export(add_js_output_binding)
export(add_module)
export(add_partial_html_template)
export(add_positconnect_file)
export(add_r6)
export(add_resource_path)
export(add_rscignore_file)
export(add_rstudioconnect_file)
export(add_sass_file)
export(add_shinyappsio_file)
Expand All @@ -35,6 +39,7 @@ export(css_template)
export(detach_all_attached)
export(disable_autoload)
export(document_and_reload)
export(empty_template)
export(expect_html_equal)
export(expect_running)
export(expect_shinytag)
Expand All @@ -47,8 +52,10 @@ export(get_golem_options)
export(get_golem_version)
export(get_golem_wd)
export(get_sysreqs)
export(golem_welcome_page)
export(install_dev_deps)
export(invoke_js)
export(is_golem)
export(is_running)
export(js_handler_template)
export(js_template)
Expand Down Expand Up @@ -79,6 +86,7 @@ export(use_internal_file)
export(use_internal_html_template)
export(use_internal_js_file)
export(use_module_test)
export(use_readme_rmd)
export(use_recommended_deps)
export(use_recommended_tests)
export(use_utils_server)
Expand All @@ -98,12 +106,15 @@ importFrom(shiny,addResourcePath)
importFrom(shiny,getShinyOption)
importFrom(shiny,htmlTemplate)
importFrom(shiny,includeScript)
importFrom(shiny,tagList)
importFrom(shiny,tags)
importFrom(tools,file_ext)
importFrom(utils,capture.output)
importFrom(utils,file.edit)
importFrom(utils,getFromNamespace)
importFrom(utils,menu)
importFrom(utils,modifyList)
importFrom(utils,person)
importFrom(utils,sessionInfo)
importFrom(yaml,read_yaml)
importFrom(yaml,write_yaml)
Loading

0 comments on commit 5fba0b3

Please sign in to comment.