upkeep

r-lib · Apr 22, 2024 · b8249e5 · b8249e5
1 parent 27e608c
commit b8249e5
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 73 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -42,7 +42,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -60,3 +60,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -22,7 +22,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -41,7 +41,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           clean: false
           branch: gh-pages

diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml
@@ -14,7 +14,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -51,7 +51,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -31,20 +31,20 @@ 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}
 
       - name: Show testthat output
         if: always()
         run: |
           ## --------------------------------------------------------------------
-          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+          find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
         shell: bash
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,23 +1,19 @@
 Package: gtable
 Title: Arrange 'Grobs' in Tables
 Version: 0.3.4.9000
-Authors@R: 
-    c(person(given = "Hadley",
-             family = "Wickham",
-             role = "aut",
-             email = "hadley@posit.co"),
-      person(given = "Thomas Lin",
-             family = "Pedersen",
-             role = c("aut", "cre"),
-             email = "thomas.pedersen@posit.co"),
-      person(given = "Posit Software, PBC",
-             role = "cph"))
-Description: Tools to make it easier to work with "tables" of
-    'grobs'. The 'gtable' package defines a 'gtable' grob class that specifies a
-    grid along with a list of grobs and their placement in the grid. Further the
-    package makes it easy to manipulate and combine 'gtable' objects so that 
-    complex compositions can be built up sequentially.
+Authors@R: c(
+    person("Hadley", "Wickham", , "hadley@posit.co", role = "aut"),
+    person("Thomas Lin", "Pedersen", , "thomas.pedersen@posit.co", role = c("aut", "cre")),
+    person("Posit Software, PBC", role = c("cph", "fnd"))
+  )
+Description: Tools to make it easier to work with "tables" of 'grobs'. The
+    'gtable' package defines a 'gtable' grob class that specifies a grid
+    along with a list of grobs and their placement in the grid. Further
+    the package makes it easy to manipulate and combine 'gtable' objects
+    so that complex compositions can be built up sequentially.
 License: MIT + file LICENSE
+URL: https://gtable.r-lib.org, https://github.com/r-lib/gtable
+BugReports: https://github.com/r-lib/gtable/issues
 Depends:
     R (>= 3.5)
 Imports:
@@ -35,10 +31,8 @@ Suggests:
     testthat (>= 3.0.0)
 VignetteBuilder: 
     knitr
+Config/Needs/website: tidyverse/tidytemplate
+Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
-URL: https://gtable.r-lib.org, https://github.com/r-lib/gtable
-BugReports: https://github.com/r-lib/gtable/issues
-Config/testthat/edition: 3
-Config/Needs/website: tidyverse/tidytemplate
+RoxygenNote: 7.3.1
diff --git a/LICENSE b/LICENSE
@@ -1,2 +1,2 @@
-YEAR: 2023
+YEAR: 2024
 COPYRIGHT HOLDER: gtable authors
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2023 gtable authors
+Copyright (c) 2024 gtable 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

diff --git a/README.md b/README.md
@@ -53,26 +53,30 @@ p <- ggplot(mtcars, aes(mpg, disp)) + geom_point()
 p_table <- ggplotGrob(p)
 
 p_table
-#> TableGrob (12 x 9) "layout": 18 grobs
-#>     z         cells       name                                         grob
-#> 1   0 ( 1-12, 1- 9) background               rect[plot.background..rect.39]
-#> 2   5 ( 6- 6, 4- 4)     spacer                               zeroGrob[NULL]
-#> 3   7 ( 7- 7, 4- 4)     axis-l           absoluteGrob[GRID.absoluteGrob.26]
-#> 4   3 ( 8- 8, 4- 4)     spacer                               zeroGrob[NULL]
-#> 5   6 ( 6- 6, 5- 5)     axis-t                               zeroGrob[NULL]
-#> 6   1 ( 7- 7, 5- 5)      panel                      gTree[panel-1.gTree.17]
-#> 7   9 ( 8- 8, 5- 5)     axis-b           absoluteGrob[GRID.absoluteGrob.22]
-#> 8   4 ( 6- 6, 6- 6)     spacer                               zeroGrob[NULL]
-#> 9   8 ( 7- 7, 6- 6)     axis-r                               zeroGrob[NULL]
-#> 10  2 ( 8- 8, 6- 6)     spacer                               zeroGrob[NULL]
-#> 11 10 ( 5- 5, 5- 5)     xlab-t                               zeroGrob[NULL]
-#> 12 11 ( 9- 9, 5- 5)     xlab-b titleGrob[axis.title.x.bottom..titleGrob.30]
-#> 13 12 ( 7- 7, 3- 3)     ylab-l   titleGrob[axis.title.y.left..titleGrob.33]
-#> 14 13 ( 7- 7, 7- 7)     ylab-r                               zeroGrob[NULL]
-#> 15 14 ( 4- 4, 5- 5)   subtitle         zeroGrob[plot.subtitle..zeroGrob.35]
-#> 16 15 ( 3- 3, 5- 5)      title            zeroGrob[plot.title..zeroGrob.34]
-#> 17 16 (10-10, 5- 5)    caption          zeroGrob[plot.caption..zeroGrob.37]
-#> 18 17 ( 2- 2, 2- 2)        tag              zeroGrob[plot.tag..zeroGrob.36]
+#> TableGrob (16 x 13) "layout": 22 grobs
+#>     z         cells             name                                         grob
+#> 1   0 ( 1-16, 1-13)       background               rect[plot.background..rect.38]
+#> 2   5 ( 8- 8, 6- 6)           spacer                               zeroGrob[NULL]
+#> 3   7 ( 9- 9, 6- 6)           axis-l           absoluteGrob[GRID.absoluteGrob.26]
+#> 4   3 (10-10, 6- 6)           spacer                               zeroGrob[NULL]
+#> 5   6 ( 8- 8, 7- 7)           axis-t                               zeroGrob[NULL]
+#> 6   1 ( 9- 9, 7- 7)            panel                      gTree[panel-1.gTree.17]
+#> 7   9 (10-10, 7- 7)           axis-b           absoluteGrob[GRID.absoluteGrob.22]
+#> 8   4 ( 8- 8, 8- 8)           spacer                               zeroGrob[NULL]
+#> 9   8 ( 9- 9, 8- 8)           axis-r                               zeroGrob[NULL]
+#> 10  2 (10-10, 8- 8)           spacer                               zeroGrob[NULL]
+#> 11 10 ( 7- 7, 7- 7)           xlab-t                               zeroGrob[NULL]
+#> 12 11 (11-11, 7- 7)           xlab-b titleGrob[axis.title.x.bottom..titleGrob.30]
+#> 13 12 ( 9- 9, 5- 5)           ylab-l   titleGrob[axis.title.y.left..titleGrob.33]
+#> 14 13 ( 9- 9, 9- 9)           ylab-r                               zeroGrob[NULL]
+#> 15 14 ( 9- 9,11-11)  guide-box-right                               zeroGrob[NULL]
+#> 16 15 ( 9- 9, 3- 3)   guide-box-left                               zeroGrob[NULL]
+#> 17 16 (13-13, 7- 7) guide-box-bottom                               zeroGrob[NULL]
+#> 18 17 ( 5- 5, 7- 7)    guide-box-top                               zeroGrob[NULL]
+#> 19 18 ( 9- 9, 7- 7) guide-box-inside                               zeroGrob[NULL]
+#> 20 19 ( 4- 4, 7- 7)         subtitle         zeroGrob[plot.subtitle..zeroGrob.35]
+#> 21 20 ( 3- 3, 7- 7)            title            zeroGrob[plot.title..zeroGrob.34]
+#> 22 21 (14-14, 7- 7)          caption          zeroGrob[plot.caption..zeroGrob.36]
 ```
 
 A gtable object is a collection of graphic elements along with their

diff --git a/man/figures/lifecycle-superseded.svg b/man/figures/lifecycle-superseded.svg
diff --git a/man/gtable-package.Rd b/man/gtable-package.Rd
diff --git a/man/gtable_col.Rd b/man/gtable_col.Rd
diff --git a/man/gtable_matrix.Rd b/man/gtable_matrix.Rd
diff --git a/man/gtable_row.Rd b/man/gtable_row.Rd
diff --git a/man/gtable_spacer.Rd b/man/gtable_spacer.Rd
diff --git a/revdep/check.R b/revdep/check.R
diff --git a/revdep/checks.rds b/revdep/checks.rds
diff --git a/revdep/email.yml b/revdep/email.yml