diff --git a/DESCRIPTION b/DESCRIPTION index 2d6f08bd..3b60520d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -9,7 +9,7 @@ Authors@R: c( person("Martin", "Morgan", role = "aut"), person("Dan", "Tenenbaum", role = "aut"), person("Posit Software, PBC", role = c("cph", "fnd")), - person("Mango Solutions", role = "cph") + person("Ascent Digital Services", role = "cph") ) Description: Download and install R packages stored in 'GitHub', 'GitLab', 'Bitbucket', 'Bioconductor', or plain 'subversion' or 'git' @@ -41,7 +41,7 @@ Suggests: testthat (>= 3.0.0), webfakes, withr -VignetteBuilder: +VignetteBuilder: knitr Config/Needs/website: tidyverse/tidytemplate Config/testthat/edition: 3 diff --git a/LICENSE b/LICENSE index bb2e3303..3eaff3df 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ -YEAR: 2021 -COPYRIGHT HOLDER: remotes authors +YEAR: 2015-2024 +COPYRIGHT HOLDER: remotes core team, see COPYRIGHTS file diff --git a/R/install-gitlab.R b/R/install-gitlab.R index f60c7c61..336c011f 100644 --- a/R/install-gitlab.R +++ b/R/install-gitlab.R @@ -10,7 +10,7 @@ #' `username/repo[@@ref]`. #' @param host GitLab API host to use. Override with your GitLab enterprise #' hostname, for example, `"gitlab.hostname.com"`. -#' The PROTOCOL is required by packrat during RStudio Connect deployment. While +#' The PROTOCOL is required by packrat during Posit Connect deployment. While #' \link{install_gitlab} may work without, omitting it generally #' leads to package restoration errors. #' @param auth_token To install from a private repo, generate a personal access diff --git a/README.Rmd b/README.Rmd index 86ef0f72..f142e58b 100644 --- a/README.Rmd +++ b/README.Rmd @@ -15,19 +15,19 @@ knitr::opts_chunk$set( # remotes -> Install R Packages from remote or local repositories, +> Install R Packages from remote or local repositories, > including GitHub, GitLab, Bitbucket, and Bioconductor [![R-CMD-check](https://github.com/r-lib/remotes/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-lib/remotes/actions/workflows/R-CMD-check.yaml) [![Codecov test coverage](https://codecov.io/gh/r-lib/remotes/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/remotes?branch=main) -[![CRAN RStudio mirror downloads](https://cranlogs.r-pkg.org/badges/remotes)](https://www.r-pkg.org/pkg/remotes) +[![CRAN Posit mirror downloads](https://cranlogs.r-pkg.org/badges/remotes)](https://www.r-pkg.org/pkg/remotes) [![](https://www.r-pkg.org/badges/version/remotes)](https://www.r-pkg.org/pkg/remotes) [![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) -Download and install R packages stored in GitHub, GitLab, Bitbucket, +Download and install R packages stored in GitHub, GitLab, Bitbucket, Bioconductor, or plain subversion or git repositories. This package is a lightweight replacement of the `install_*` functions in [`devtools`](https://github.com/r-lib/devtools). @@ -231,4 +231,4 @@ It also uses some remotes specific options: ## License -GPL (>= 2) © Mango Solutions, RStudio +GPL (>= 2) © Ascent Digital Services, Posit Software, PBC diff --git a/README.md b/README.md index 57909144..0084ab77 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ [![R-CMD-check](https://github.com/r-lib/remotes/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-lib/remotes/actions/workflows/R-CMD-check.yaml) [![Codecov test coverage](https://codecov.io/gh/r-lib/remotes/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/remotes?branch=main) -[![CRAN RStudio mirror +[![CRAN Posit mirror downloads](https://cranlogs.r-pkg.org/badges/remotes)](https://www.r-pkg.org/pkg/remotes) [![](https://www.r-pkg.org/badges/version/remotes)](https://www.r-pkg.org/pkg/remotes) [![Lifecycle: @@ -224,4 +224,4 @@ It also uses some remotes specific options: ## License -GPL (\>= 2) © Mango Solutions, RStudio +GPL (\>= 2) © Ascent Digital Services, Posit Software, PBC diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS new file mode 100644 index 00000000..322f3d55 --- /dev/null +++ b/inst/COPYRIGHTS @@ -0,0 +1,3 @@ +(c) 2015-2016 Ascent Digital Services (formerly Mango Solutions) +(c) 2017 Gábor Csárdi +(c) 2017-2024 Posit Software, PBC (formerly RStudio) diff --git a/inst/install-github.R b/inst/install-github.R index e6ea63c7..7eb0049a 100644 --- a/inst/install-github.R +++ b/inst/install-github.R @@ -4066,7 +4066,7 @@ function(...) { #' `username/repo[@@ref]`. #' @param host GitLab API host to use. Override with your GitLab enterprise #' hostname, for example, `"gitlab.hostname.com"`. - #' The PROTOCOL is required by packrat during RStudio Connect deployment. While + #' The PROTOCOL is required by packrat during Posit Connect deployment. While #' \link{install_gitlab} may work without, omitting it generally #' leads to package restoration errors. #' @param auth_token To install from a private repo, generate a personal access diff --git a/install-github.R b/install-github.R index e6ea63c7..7eb0049a 100644 --- a/install-github.R +++ b/install-github.R @@ -4066,7 +4066,7 @@ function(...) { #' `username/repo[@@ref]`. #' @param host GitLab API host to use. Override with your GitLab enterprise #' hostname, for example, `"gitlab.hostname.com"`. - #' The PROTOCOL is required by packrat during RStudio Connect deployment. While + #' The PROTOCOL is required by packrat during Posit Connect deployment. While #' \link{install_gitlab} may work without, omitting it generally #' leads to package restoration errors. #' @param auth_token To install from a private repo, generate a personal access diff --git a/man/install_gitlab.Rd b/man/install_gitlab.Rd index f3b99ed5..4679758e 100644 --- a/man/install_gitlab.Rd +++ b/man/install_gitlab.Rd @@ -37,7 +37,7 @@ GITLAB_PAT environment variable.} \item{host}{GitLab API host to use. Override with your GitLab enterprise hostname, for example, \code{"gitlab.hostname.com"}. -The PROTOCOL is required by packrat during RStudio Connect deployment. While +The PROTOCOL is required by packrat during Posit Connect deployment. While \link{install_gitlab} may work without, omitting it generally leads to package restoration errors.} @@ -97,7 +97,7 @@ install_gitlab("jimhester/covr") } } \seealso{ -Other package installation: +Other package installation: \code{\link{install_bioc}()}, \code{\link{install_bitbucket}()}, \code{\link{install_cran}()}, diff --git a/man/remotes-package.Rd b/man/remotes-package.Rd index 61862597..d202a358 100644 --- a/man/remotes-package.Rd +++ b/man/remotes-package.Rd @@ -32,7 +32,7 @@ Authors: Other contributors: \itemize{ \item Posit Software, PBC [copyright holder, funder] - \item Mango Solutions [copyright holder] + \item Ascent Digital Services [copyright holder] } } diff --git a/tests/testthat/archives/foo/DESCRIPTION b/tests/testthat/archives/foo/DESCRIPTION index 6555fccf..77fcee62 100644 --- a/tests/testthat/archives/foo/DESCRIPTION +++ b/tests/testthat/archives/foo/DESCRIPTION @@ -3,5 +3,5 @@ Title: Foo Bar Description: Seriously. Foo Bar. Version: 1.0.0 Author: Gabor Csardi -Maintainer: Gabor Csardi +Maintainer: Gabor Csardi License: MIT + file LICENSE diff --git a/tests/testthat/submodule/DESCRIPTION b/tests/testthat/submodule/DESCRIPTION index 197ad92c..3a3ac3dc 100644 --- a/tests/testthat/submodule/DESCRIPTION +++ b/tests/testthat/submodule/DESCRIPTION @@ -3,5 +3,5 @@ Title: Foo Bar Description: Seriously. Foo Bar. Version: 1.0.0 Author: Gabor Csardi -Maintainer: Gabor Csardi +Maintainer: Gabor Csardi License: MIT + file LICENSE diff --git a/tests/testthat/test-install-svn.R b/tests/testthat/test-install-svn.R index e41475b6..b31e3a75 100644 --- a/tests/testthat/test-install-svn.R +++ b/tests/testthat/test-install-svn.R @@ -42,7 +42,7 @@ test_that("downloading a wrong SVN revision", { skip_if_offline() x <- list( - url = "https://github.com/mangothecat/simplegraph/trunk", + url = "https://github.com/gaborcsardi/simplegraph/trunk", revision = "xxx" ) diff --git a/tests/testthat/test-install-url.R b/tests/testthat/test-install-url.R index 178c8d58..c79cee60 100644 --- a/tests/testthat/test-install-url.R +++ b/tests/testthat/test-install-url.R @@ -9,7 +9,7 @@ test_that("install_url", { on.exit(unlink(lib, recursive = TRUE), add = TRUE) dir.create(lib) - url <- "https://github.com/mangothecat/simplegraph/archive/HEAD.zip" + url <- "https://github.com/gaborcsardi/simplegraph/archive/HEAD.zip" install_url(url, lib = lib, quiet = TRUE) expect_silent(packageDescription("simplegraph", lib.loc = lib))