Merge branch 'main' into feature/builder

.Rbuildignore

@@ -23,3 +23,4 @@
 ^revdep$
 ^codecov\.yml$
 ^man/macros/eval2[.]Rd$
+^LICENSE\.md$

.github/CODE_OF_CONDUCT.md

@@ -59,7 +59,7 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at codeofconduct@rstudio.com. 
+reported to the community leaders responsible for enforcement at codeofconduct@posit.co. 
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/workflows/R-CMD-check.yaml

@@ -23,19 +23,20 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
           # Use 3.6 to trigger usage of RTools35
           - {os: windows-latest, r: '3.6'}
+          # use 4.1 to check with rtools40's older compiler
+          - {os: windows-latest, r: '4.1'}
 
-          # Use older ubuntu to maximise backward compatibility
-          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,  r: 'release'}
-          - {os: ubuntu-latest,  r: 'oldrel-1'}
-          - {os: ubuntu-latest,  r: 'oldrel-2'}
-          - {os: ubuntu-latest,  r: 'oldrel-3'}
-          - {os: ubuntu-latest,  r: 'oldrel-4'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: ubuntu-latest,   r: 'oldrel-2'}
+          - {os: ubuntu-latest,   r: 'oldrel-3'}
+          - {os: ubuntu-latest,   r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pkgdown.yaml

@@ -19,6 +19,8 @@ jobs:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
 
@@ -50,7 +52,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/[email protected].4
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           clean: false
           branch: gh-pages

.github/workflows/test-coverage.yaml

@@ -37,7 +37,7 @@ jobs:
           covr::codecov(
             quiet = FALSE,
             clean = FALSE,
-            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
         shell: Rscript {0}
 

.gitignore

@@ -14,3 +14,4 @@ Meta
 /dev-lib
 /man/_cache
 /man/macros/eval2.Rd
+/revdep

DESCRIPTION

@@ -1,9 +1,9 @@
 Package: pkgdepends
 Title: Package Dependency Resolution and Downloads
-Version: 0.5.0.9001
+Version: 0.7.1.9000
 Authors@R: c(
     person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
-    person("RStudio", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"))
   )
 Description: Find recursive dependencies of 'R' packages from various
     sources. Solve the dependencies to obtain a consistent set of packages
@@ -14,44 +14,47 @@ Description: Find recursive dependencies of 'R' packages from various
     all 'HTTP' requests, downloads, builds and installations in parallel.
     'pkgdepends' is the workhorse of the 'pak' package.
 License: MIT + file LICENSE
-URL: https://github.com/r-lib/pkgdepends#readme
+URL: https://r-lib.github.io/pkgdepends/,
+    https://github.com/r-lib/pkgdepends
 BugReports: https://github.com/r-lib/pkgdepends/issues
-Depends: R (>= 3.4)
+Depends:
+    R (>= 3.5)
 Imports:
     callr (>= 3.3.1),
     cli (>= 3.6.0),
     curl,
-    desc (>= 1.2.0),
+    desc (>= 1.4.3),
     filelock (>= 1.0.2),
-    glue,
     jsonlite,
     lpSolve,
     pkgbuild (>= 1.0.2),
-    pkgcache (>= 2.1.1.9000),
+    pkgcache (>= 2.2.0),
     prettyunits (>= 1.1.1),
     processx (>= 3.4.2),
     ps,
     R6,
-    rprojroot,
     stats,
     utils,
     zip (>= 2.3.0)
 Suggests:
     asciicast (>= 2.2.0.9000),
+    codetools,
     covr,
     debugme,
     fansi,
     fs,
     gh,
     gitcreds,
+    glue,
     htmlwidgets,
     mockery,
     pak,
     pingr (>= 2.0.0),
     rmarkdown,
     rstudioapi,
     spelling,
-    testthat,
+    svglite,
+    testthat (>= 3.2.0),
     tibble,
     webfakes (>= 1.1.5.9000),
     withr (>= 2.1.1),
@@ -60,15 +63,10 @@ Remotes:
 Config/Needs/builder:
     gh,
     pkgsearch,
-    withr
+    withr (>= 2.1.1)
 Config/Needs/coverage:
     r-lib/asciicast,
-    covr,
-    rmarkdown,
-    svglite
-Config/Needs/dev:
-    rmarkdown,
-    svglite
+    covr
 Config/Needs/website:
     r-lib/asciicast,
     pkgdown (>= 2.0.2),

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2017
-COPYRIGHT HOLDER: RStudio
+YEAR: 2023
+COPYRIGHT HOLDER: pkgdepends authors

LICENSE.md

@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2023 pkgdepends authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

NAMESPACE

@@ -63,44 +63,6 @@ export(sysreqs_install_plan)
 export(sysreqs_is_supported)
 export(sysreqs_list_system_packages)
 export(sysreqs_platforms)
-importFrom(callr,poll)
-importFrom(callr,r_process_options)
-importFrom(cli,ansi_hide_cursor)
-importFrom(cli,ansi_show_cursor)
-importFrom(cli,cli_alert_danger)
-importFrom(cli,cli_alert_info)
-importFrom(cli,cli_alert_success)
-importFrom(cli,cli_alert_warning)
-importFrom(cli,cli_status)
-importFrom(cli,cli_status_clear)
-importFrom(cli,cli_status_update)
-importFrom(cli,col_blue)
-importFrom(cli,get_spinner)
-importFrom(cli,is_utf8_output)
-importFrom(cli,qty)
-importFrom(cli,style_bold)
-importFrom(cli,symbol)
-importFrom(cli,tree)
-importFrom(desc,desc)
-importFrom(desc,desc_get_deps)
-importFrom(filelock,lock)
-importFrom(filelock,unlock)
-importFrom(glue,backtick)
-importFrom(glue,glue)
-importFrom(glue,glue_collapse)
-importFrom(glue,glue_data)
-importFrom(glue,single_quote)
-importFrom(jsonlite,fromJSON)
-importFrom(jsonlite,toJSON)
-importFrom(jsonlite,unbox)
-importFrom(lpSolve,lp)
-importFrom(pkgbuild,build)
-importFrom(pkgbuild,pkgbuild_process)
-importFrom(prettyunits,pretty_bytes)
-importFrom(prettyunits,pretty_dt)
-importFrom(prettyunits,pretty_sec)
-importFrom(rprojroot,find_package_root_file)
 importFrom(stats,na.omit)
 importFrom(utils,modifyList)
 importFrom(utils,untar)
-importFrom(zip,unzip_process)

NEWS.md

@@ -1,7 +1,75 @@
 # pkgdepends (development version)
 
+# pkgdepends 0.7.1
+
+* pkgdepends now does not import the glue, rprojroot and prettyunits
+  packages.
+
+* pkgdepends can now handle the case when `Config/Needs/*` dependencies
+  are requested for package from a repository.
+
+# pkgdepends 0.7.0
+
+* pkgdepends now correctly resolves the latest GitHub release with
+  the `@*release` notation (@pawelru, #321, #275).
+
+* pkgdepends now correctly handles having multiple instances of the same
+  package in the metadata, with different R version requirements
+  (https://github.com/r-lib/pak/issues/534, #331,
+  https://github.com/r-lib/pak/issues/538).
+
+* `git::` package references work better now for Azure DevOps
+  (@jameslairdsmith, #333, #342).
+
+* pkgdepends now does a better job at accepting installed packages, and
+  avoids reinstalling more packages than needed when using a lock file
+  (https://github.com/r-lib/actions/issues/759, #338).
+
+# pkgdepends 0.6.0
+
+* Many system requirements improvements:
+  - New functions:
+    - `sysreqs_check_installed()`: check if all required system packages
+      are installed,
+    - `sysreqs_fix_installed()`: install missing system packages,
+    - `sysreqs_db_list()`: list system requirements database,
+    - `sysreqs_db_match()`: match `SystemRrequirements` field(s) to database,
+    - `sysreqs_db_update()`: update system requirements database,
+    - `sysreqs_install_plan()`: look up system requirements for a package and
+      its dependencies,
+    - `sysreqs_is_supported()`: check if pkgdepends supports system
+      requirements on your platform,
+    - `sysreqs_list_system_packages()`: list installed system packages,
+    - `sysreqs_platforms()`: list supported platforms.
+    - New `pkg_installation_proposal` methods: `get_sysreqs()`, `show_sysreqs()`
+      and `update_sysreqs()`.
+  - The output of `$show_solution()` now includes system requirements.
+  - New `sysreqs_platform` configuration option.
+  - pkgdepends now looks up system requirements asynchronously, during
+    dependency resolution.
+  - pkgdepends now does not reinstall system requirements by default,
+    if they are already installed. (You can force a reinstall/upgrade
+    with the `sysreqs_update` configuration option.)
+
+* New `gitlab::` package source to install packages from GitLab (#315).
+
 * pkgdepends now correctly parses multiple `git::` packages at once (#318).
 
+* Fix `@*release` reference for the latest release.
+
+* `git::` package sources now support version 1 of the git protocol.
+  E.g. the Bioconductor git repositories now work:
+  `git::https://git.bioconductor.org/packages/limma` (#314).
+
+* The `platforms` config parameter now works correctly with `deps::`
+  package sources (https://github.com/r-lib/pak/issues/522).
+
+* New `include_linkingto` config parameter to always include `LinkingTo`
+  packages in the solution, even for binaries (#485).
+
+* `pkg_name_check()` now does not include Acromine results, because the web
+  site was unstable.
+
 # pkgdepends 0.5.0
 
 * pkgdepends now support git repositories as package references. E.g.

R/build.R

@@ -1,5 +1,4 @@
 
-#' @importFrom pkgbuild build
 #' @importFrom utils modifyList
 
 build_package <- function(path, build_args = list()) {
@@ -9,5 +8,5 @@ build_package <- function(path, build_args = list()) {
   )
   args <- modifyList(default_args, build_args)
   zip_path <- system.file(package = "zip", "bin", .Platform$r_arch)
-  withr_with_path(zip_path, do.call(build, args))
+  withr_with_path(zip_path, do.call(pkgbuild::build, args))
 }