Merge branch 'main' into f-inline-test-select

.aviator/config.yml

@@ -27,7 +27,7 @@ merge_rules:
     type: default
   auto_update:
     enabled: true
-    label: ''
+    label: 'mergequeue'
     max_runs_for_update: 0
   merge_commit:
     use_title_and_body: false

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

@@ -51,7 +51,7 @@ jobs:
           install-r: false
           cache-version: rcc-smoke-2
           needs: check
-          extra-packages: any::rcmdcheck any::roxygen2 r-lib/styler
+          extra-packages: any::rcmdcheck krlmlr/roxygen2 r-lib/styler
 
       - uses: ./.github/workflows/custom/after-install
         if: hashFiles('.github/workflows/custom/after-install/action.yml') != ''

.github/workflows/backends.yaml

@@ -49,6 +49,7 @@ jobs:
 
   backend:
     needs: matrix
+    # Need Ubuntu 20.04 for remotes::system_requirements()
     runs-on: ubuntu-20.04
 
     strategy:
@@ -70,35 +71,21 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v2
-
-      - name: Install remotes
-        run: |
-          if (!requireNamespace("curl", quietly = TRUE)) install.packages("curl")
-          if (!requireNamespace("remotes", quietly = TRUE)) install.packages("remotes")
-        shell: Rscript {0}
+      - uses: ./.github/workflows/install
+        with:
+          install-r: false
+          cache-version: backends-${{ matrix.package }}
+          needs: check
+          extra-packages: "any::pkgbuild any::remotes decor ."
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Clone backend
         run: |
           make -C revdep-dev ${{ matrix.package }}
 
-      - name: Prepare cache keys
-        if: runner.os != 'Windows'
-        run: |
-          saveRDS(remotes::dev_package_deps("revdep-dev/${{ matrix.package }}", dependencies = TRUE, type = .Platform$pkgType), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
-
-      - name: Cache R packages
-        if: runner.os != 'Windows'
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.R_LIBS_USER }}
-          key: backends-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: backends-${{ hashFiles('.github/R-version') }}-2-
-
       - name: Install system dependencies
         if: runner.os == 'Linux'
+        # "22.04" fails here
         run: |
           while read -r cmd
           do
@@ -109,7 +96,6 @@ jobs:
         run: |
           remotes::install_local("revdep-dev/${{ matrix.package }}", dependencies = TRUE, type = .Platform$pkgType)
           remotes::install_local(".", type = .Platform$pkgType, force = TRUE)
-          remotes::install_cran("pkgbuild")
         shell: Rscript {0}
 
       - name: Session info

.github/workflows/odbc.yaml

@@ -15,7 +15,7 @@ name: backends odbc
 
 jobs:
   matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -90,33 +90,18 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v2
-
-      - name: Install remotes
-        run: |
-          if (!requireNamespace("curl", quietly = TRUE)) install.packages("curl")
-          if (!requireNamespace("remotes", quietly = TRUE)) install.packages("remotes")
-        shell: Rscript {0}
+      - uses: ./.github/workflows/install
+        with:
+          install-r: false
+          cache-version: backends-${{ matrix.package }}
+          needs: check
+          extra-packages: "any::pkgbuild any::remotes decor ."
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Clone backend
         run: |
           make -C revdep-dev ${{ matrix.package }}
 
-      - name: Prepare cache keys
-        if: runner.os != 'Windows'
-        run: |
-          saveRDS(remotes::dev_package_deps("revdep-dev/${{ matrix.package }}", dependencies = TRUE, type = .Platform$pkgType), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
-
-      - name: Cache R packages
-        if: runner.os != 'Windows'
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.R_LIBS_USER }}
-          key: backends-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: backends-${{ hashFiles('.github/R-version') }}-2-
-
       - name: Install system dependencies
         if: runner.os == 'Linux'
         # "22.04" fails here
@@ -130,7 +115,6 @@ jobs:
         run: |
           remotes::install_local("revdep-dev/${{ matrix.package }}", dependencies = TRUE, type = .Platform$pkgType)
           remotes::install_local(".", type = .Platform$pkgType, force = TRUE)
-          remotes::install_cran("pkgbuild")
         shell: Rscript {0}
 
       - name: Session info

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: DBItest
 Title: Testing DBI Backends
-Version: 1.7.3.9014
-Date: 2023-12-18
+Version: 1.8.0.9009
+Date: 2024-01-23
 Authors@R: c(
     person("Kirill", "Müller", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-1416-3412")),
@@ -18,7 +18,7 @@ Depends:
 Imports: 
     blob (>= 1.2.0),
     callr,
-    DBI (>= 1.1.3.9004),
+    DBI (>= 1.2.1),
     desc,
     hms (>= 0.5.0),
     lubridate,
@@ -29,12 +29,10 @@ Imports:
     rlang (>= 0.2.0),
     testthat (>= 2.0.0),
     utils,
-    vctrs,
     withr
 Suggests: 
     clipr,
     constructive,
-    dblog (>= 0.0.0.9008),
     debugme,
     devtools,
     dplyr,
@@ -46,16 +44,18 @@ Suggests:
 VignetteBuilder: 
     knitr
 Remotes: 
-    r-dbi/DBI
-Additional_repositories: https://r-dbi.r-universe.dev
+    r-dbi/DBI,
+    r-dbi/RSQLite
+Config/Needs/website: 
+    r-dbi/dbitemplate
 Config/autostyle/scope: line_breaks
 Config/autostyle/strict: false
-Config/gha/extra-packages: r-dbi/dblog
 Config/testthat/edition: 3
+Config/Needs/check: decor
 Encoding: UTF-8
 KeepSource: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0.9000
 Collate: 
     'DBItest.R'
     'compat-purrr.R'

NAMESPACE

@@ -20,7 +20,8 @@ export(test_stress)
 export(test_transaction)
 export(tweaks)
 import(DBI)
-import(testthat)
+import(rlang)
+import(testthat, except = c(is_null, is_false, is_true))
 importFrom(callr,r)
 importFrom(lubridate,with_tz)
 importFrom(magrittr,"%>%")
@@ -31,36 +32,6 @@ importFrom(methods,getClasses)
 importFrom(methods,hasMethod)
 importFrom(methods,is)
 importFrom(methods,new)
-importFrom(rlang,"%||%")
-importFrom(rlang,":=")
-importFrom(rlang,abort)
-importFrom(rlang,arg_match)
-importFrom(rlang,as_function)
-importFrom(rlang,call2)
-importFrom(rlang,caller_env)
-importFrom(rlang,check_dots_empty)
-importFrom(rlang,enexpr)
-importFrom(rlang,enquo)
-importFrom(rlang,enquos)
-importFrom(rlang,eval_tidy)
-importFrom(rlang,exec)
-importFrom(rlang,expr)
-importFrom(rlang,global_env)
-importFrom(rlang,has_length)
-importFrom(rlang,is_installed)
-importFrom(rlang,is_interactive)
-importFrom(rlang,is_logical)
-importFrom(rlang,is_missing)
-importFrom(rlang,list2)
-importFrom(rlang,local_options)
-importFrom(rlang,new_function)
-importFrom(rlang,pairlist2)
-importFrom(rlang,parse_expr)
-importFrom(rlang,quo)
-importFrom(rlang,quo_get_expr)
-importFrom(rlang,quo_is_null)
-importFrom(rlang,seq2)
-importFrom(rlang,set_names)
 importFrom(stats,setNames)
 importFrom(utils,head)
 importFrom(withr,with_output_sink)