From a039d953c28b9e49336584a5f0cf85b5f9f332be Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Fri, 17 May 2024 13:54:48 +0200 Subject: [PATCH 1/2] deployment call updated --- DESCRIPTION | 2 +- NAMESPACE | 1 + R/shinyfaithful-package.R | 7 +++++++ deploy/deploy-shinyapps.R | 6 ++++-- man/shinyfaithful-package.Rd | 23 +++++++++++++++++++++++ renv.lock | 30 ++++++++++-------------------- 6 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 R/shinyfaithful-package.R create mode 100644 man/shinyfaithful-package.Rd diff --git a/DESCRIPTION b/DESCRIPTION index 746d897..a012b41 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,6 +8,7 @@ Imports: config (>= 0.3.2), golem (>= 0.4.1), graphics, + pkgload, shiny (>= 1.8.1.1) Encoding: UTF-8 LazyData: true @@ -15,7 +16,6 @@ RoxygenNote: 7.3.1 URL: https://github.com/guidomaggioorg/shinyfaithful BugReports: https://github.com/guidomaggioorg/shinyfaithful/issues Suggests: - pkgload, rsconnect, spelling, testthat (>= 3.0.0) diff --git a/NAMESPACE b/NAMESPACE index abbe80c..6ab9621 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,4 +8,5 @@ importFrom(golem,bundle_resources) importFrom(golem,favicon) importFrom(golem,with_golem_options) importFrom(graphics,hist) +importFrom(pkgload,load_all) importFrom(shiny,shinyApp) diff --git a/R/shinyfaithful-package.R b/R/shinyfaithful-package.R new file mode 100644 index 0000000..0840e48 --- /dev/null +++ b/R/shinyfaithful-package.R @@ -0,0 +1,7 @@ +#' @keywords internal +"_PACKAGE" + +## usethis namespace: start +#' @importFrom pkgload load_all +## usethis namespace: end +NULL diff --git a/deploy/deploy-shinyapps.R b/deploy/deploy-shinyapps.R index eac8e71..6d083fa 100644 --- a/deploy/deploy-shinyapps.R +++ b/deploy/deploy-shinyapps.R @@ -13,10 +13,12 @@ app_files = c( "DESCRIPTION", "NAMESPACE", "R/", - "inst/" + "inst/", + "renv.lock", + ".rscignore" ) # options(rsconnect.packrat = TRUE) rsconnect::deployApp( account = "gmaggio", # not necessary - appName = "FaithfulPlots", appFiles = app_files, forceUpdate = TRUE + appName = "FaithfulPlotsTest", appFiles = app_files, forceUpdate = TRUE ) diff --git a/man/shinyfaithful-package.Rd b/man/shinyfaithful-package.Rd new file mode 100644 index 0000000..50ab08a --- /dev/null +++ b/man/shinyfaithful-package.Rd @@ -0,0 +1,23 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/shinyfaithful-package.R +\docType{package} +\name{shinyfaithful-package} +\alias{shinyfaithful} +\alias{shinyfaithful-package} +\title{shinyfaithful: Shiny4 workshop pkg} +\description{ +Package used for the 4th course of the Series Intro to Shiny. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/guidomaggioorg/shinyfaithful} + \item Report bugs at \url{https://github.com/guidomaggioorg/shinyfaithful/issues} +} + +} +\author{ +\strong{Maintainer}: Guido Maggio \email{guido.maggio@mirai-solutions.com} + +} +\keyword{internal} diff --git a/renv.lock b/renv.lock index d2e58d3..154549e 100644 --- a/renv.lock +++ b/renv.lock @@ -80,23 +80,25 @@ }, "bslib": { "Package": "bslib", - "Version": "0.5.0", + "Version": "0.7.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "cachem", + "fastmap", "grDevices", "htmltools", "jquerylib", "jsonlite", + "lifecycle", "memoise", "mime", "rlang", "sass" ], - "Hash": "1b117970533deb6d4e992c1b34e9d905" + "Hash": "8644cc53f43828f19133548195d7e59e" }, "cachem": { "Package": "cachem", @@ -164,13 +166,13 @@ }, "curl": { "Package": "curl", - "Version": "5.0.1", + "Version": "5.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "2118af9cb164c8d2dddc7b89eaf732d9" + "Hash": "411ca2c03b1ce5f548345d2fc2685f7a" }, "desc": { "Package": "desc", @@ -212,17 +214,6 @@ ], "Hash": "698ece7ba5a4fa4559e3d537e7ec3d31" }, - "ellipsis": { - "Package": "ellipsis", - "Version": "0.3.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "rlang" - ], - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077" - }, "evaluate": { "Package": "evaluate", "Version": "0.21", @@ -328,20 +319,19 @@ }, "htmltools": { "Package": "htmltools", - "Version": "0.5.5", + "Version": "0.5.8.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "digest", - "ellipsis", "fastmap", "grDevices", "rlang", "utils" ], - "Hash": "ba0240784ad50a62165058a27459304a" + "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" }, "httpuv": { "Package": "httpuv", @@ -685,7 +675,7 @@ }, "sass": { "Package": "sass", - "Version": "0.4.6", + "Version": "0.4.9", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -695,7 +685,7 @@ "rappdirs", "rlang" ], - "Hash": "cc3ec7dd33982ef56570229b62d6388e" + "Hash": "d53dbfddf695303ea4ad66f86e99b95d" }, "shiny": { "Package": "shiny", From cd26bfc3002c59d2e5dd15715300c45f112bcfb7 Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Fri, 17 May 2024 14:01:24 +0200 Subject: [PATCH 2/2] Removed pkgload from NAMESPACE --- NAMESPACE | 1 - R/shinyfaithful-package.R | 7 ------- deploy/deploy-shinyapps.R | 2 +- man/shinyfaithful-package.Rd | 23 ----------------------- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 R/shinyfaithful-package.R delete mode 100644 man/shinyfaithful-package.Rd diff --git a/NAMESPACE b/NAMESPACE index 6ab9621..abbe80c 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,5 +8,4 @@ importFrom(golem,bundle_resources) importFrom(golem,favicon) importFrom(golem,with_golem_options) importFrom(graphics,hist) -importFrom(pkgload,load_all) importFrom(shiny,shinyApp) diff --git a/R/shinyfaithful-package.R b/R/shinyfaithful-package.R deleted file mode 100644 index 0840e48..0000000 --- a/R/shinyfaithful-package.R +++ /dev/null @@ -1,7 +0,0 @@ -#' @keywords internal -"_PACKAGE" - -## usethis namespace: start -#' @importFrom pkgload load_all -## usethis namespace: end -NULL diff --git a/deploy/deploy-shinyapps.R b/deploy/deploy-shinyapps.R index 6d083fa..06bd434 100644 --- a/deploy/deploy-shinyapps.R +++ b/deploy/deploy-shinyapps.R @@ -20,5 +20,5 @@ app_files = c( # options(rsconnect.packrat = TRUE) rsconnect::deployApp( account = "gmaggio", # not necessary - appName = "FaithfulPlotsTest", appFiles = app_files, forceUpdate = TRUE + appName = "FaithfulPlots", appFiles = app_files, forceUpdate = TRUE ) diff --git a/man/shinyfaithful-package.Rd b/man/shinyfaithful-package.Rd deleted file mode 100644 index 50ab08a..0000000 --- a/man/shinyfaithful-package.Rd +++ /dev/null @@ -1,23 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/shinyfaithful-package.R -\docType{package} -\name{shinyfaithful-package} -\alias{shinyfaithful} -\alias{shinyfaithful-package} -\title{shinyfaithful: Shiny4 workshop pkg} -\description{ -Package used for the 4th course of the Series Intro to Shiny. -} -\seealso{ -Useful links: -\itemize{ - \item \url{https://github.com/guidomaggioorg/shinyfaithful} - \item Report bugs at \url{https://github.com/guidomaggioorg/shinyfaithful/issues} -} - -} -\author{ -\strong{Maintainer}: Guido Maggio \email{guido.maggio@mirai-solutions.com} - -} -\keyword{internal}