Merge pull request #955 from tidyverse/importFrom_lifecycle

- Avoid blanket import for lifecycle package for compatibility with upcoming rlang (#955, @romainfrancois).
tidyverse · Sep 26, 2021 · 837eb52 · 837eb52
2 parents b0bab86 + 26dce68
commit 837eb52
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/R-CMD-check-dev.yaml b/.github/workflows/R-CMD-check-dev.yaml
@@ -235,8 +235,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ubuntu-18.04-r-dev-release-${{ matrix.package }}-${{steps.date.outputs.date}}
-          restore-keys: ubuntu-18.04-r-dev-release-${{ matrix.package }}-
+          key: ubuntu-18.04-r-dev-release-${{ matrix.package }}-1-${{steps.date.outputs.date}}
+          restore-keys: ubuntu-18.04-r-dev-release-${{ matrix.package }}-1-
 
       - name: Install system dependencies
         if: runner.os == 'Linux'

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -107,8 +107,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ matrix.config.os }}${{ matrix.config.os-version }}-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ matrix.config.os }}${{ matrix.config.os-version }}-${{ hashFiles('.github/R-version') }}-2-
+          key: ${{ matrix.config.os }}${{ matrix.config.os-version }}-${{ hashFiles('.github/R-version') }}-3-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ matrix.config.os }}${{ matrix.config.os-version }}-${{ hashFiles('.github/R-version') }}-3-
 
       - name: Install system dependencies
         if: runner.os == 'Linux'

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -86,8 +86,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-2-
 
       - name: Install system dependencies
         if: runner.os == 'Linux'

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -60,8 +60,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ubuntu-18.04-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ubuntu-18.04-${{ hashFiles('.github/R-version') }}-2-
+          key: ubuntu-18.04-${{ hashFiles('.github/R-version') }}-3-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ubuntu-18.04-${{ hashFiles('.github/R-version') }}-3-
 
       - name: Install system dependencies
         if: runner.os == 'Linux'

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -71,7 +71,7 @@ VignetteBuilder:
     knitr
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1.9001
+RoxygenNote: 7.1.2
 Config/testthat/edition: 3
 Config/testthat/parallel: true
 Config/testthat/start-first: subsetting, as_tibble, add, invariants
diff --git a/NAMESPACE b/NAMESPACE
@@ -70,8 +70,10 @@ export(validate_tibble)
 export(view)
 exportClasses(tbl_df)
 import(ellipsis)
-import(lifecycle)
 import(rlang)
+importFrom(lifecycle,deprecate_soft)
+importFrom(lifecycle,deprecate_warn)
+importFrom(lifecycle,expect_deprecated)
 importFrom(magrittr,"%>%")
 importFrom(methods,setOldClass)
 importFrom(pillar,dim_desc)

diff --git a/R/tibble-package.R b/R/tibble-package.R
@@ -2,8 +2,8 @@
 #' @importFrom utils head tail
 #' @importFrom pkgconfig set_config
 #' @import rlang
-#' @import lifecycle
 #' @import ellipsis
+#' @importFrom lifecycle deprecate_soft deprecate_warn expect_deprecated
 #' @importFrom vctrs vec_as_location vec_as_location2 vec_as_names vec_as_names_legacy vec_c
 #' @importFrom vctrs vec_is vec_rbind vec_recycle vec_size vec_slice vec_assign
 #' @importFrom vctrs unspecified vec_as_subscript2 num_as_location vec_ptype_abbr

diff --git a/man/enframe.Rd b/man/enframe.Rd
diff --git a/man/tibble-package.Rd b/man/tibble-package.Rd
diff --git a/tests/testthat/_snaps/vignette-formats/formats.md b/tests/testthat/_snaps/vignette-formats/formats.md
@@ -104,7 +104,6 @@ library(tidyr)
 #> The following object is masked from 'package:testthat':
 #> 
 #>     matches
-
 stocks <- 
   expand_grid(id = factor(1:4), year = 2018:2022) %>% 
   mutate(stock = currency(runif(20) * 10000))
@@ -137,13 +136,21 @@ stocks %>%
 It pays off to specify formatting very early in the process.
 The diagram below shows the principal stages of data analysis and exploration from "R for data science".
 
-![](${TEMP}/formats_files/figure-markdown_strict/unnamed-chunk-8-1.png)
+
+```{=html}
+<div id="htmlwidget-dbf0c8daf9db0415fdf5" style="width:672px;height:480px;" class="DiagrammeR html-widget"></div>
+<script type="application/json" data-for="htmlwidget-dbf0c8daf9db0415fdf5">{"x":{"diagram":"graph TD\n  Import --> Tidy\n  Tidy --> Transform\n  Transform --> Visualize\n  Visualize --> Communicate\n  Visualize --> Model\n  Model -.-> Transform"},"evals":[],"jsHooks":[]}</script>
+```
 
 The subsequent diagram adds data formats, communication options, and explicit data formatting.
 The original r4ds transitions are highlighted in bold.
 There are two principal options where to apply formatting for results: right before communicating them, or right after importing.
 
-![](${TEMP}/formats_files/figure-markdown_strict/unnamed-chunk-9-1.png)
+
+```{=html}
+<div id="htmlwidget-ec529900dc9c9fda496e" style="width:672px;height:480px;" class="DiagrammeR html-widget"></div>
+<script type="application/json" data-for="htmlwidget-ec529900dc9c9fda496e">{"x":{"diagram":"graph TD\n  .csv --> Import\n  API --> Import\n  DBI --> Import\n  dbplyr --> Import\n  Import -.-> Format[Format for analysis]\n  Format -.-> Tidy\n\n  subgraph r4ds\n  Import ==> Tidy\n  Tidy ==> Transform\n  Transform ==> Visualize\n  Visualize ==> Model\n  Model -.-> Transform\n  Visualize ==> Communicate\n  end\n\n  Visualize -.-> FormatComm[Format for communication]\n  FormatComm -.-> Communicate\n\n  FormatComm -- Apply formatting early --> Format\n\n  dbplyr -.-> Tidy\n  dbplyr -.-> Transform\n  dbplyr -.-> Visualize\n\n  Communicate --> gt\n  Communicate --> ggplot2\n  Communicate --> DT\n  Communicate --> plotly"},"evals":[],"jsHooks":[]}</script>
+```
 
 Applying formatting early in the process gives the added benefit of showing the data in a useful format during the "Tidy", "Transform", and "Visualize" stages.
 For this to be useful, we need to ensure that the formatting options applied early:
@@ -181,7 +188,6 @@ tbl3
 #> 1 a         9    10    81    91     9  0.412  112.     1
 #> 2 b        10    11   100   111     9 -0.544  112.     1
 #> 3 c        11    12   121   133    10 -1.00   112.     1
-
 tbl3 %>% 
   mutate(
     across(where(is.numeric), digits, 3),

diff --git a/tests/testthat/_snaps/vignette-invariants/invariants.md b/tests/testthat/_snaps/vignette-invariants/invariants.md
@@ -3353,12 +3353,6 @@ with_tbl(tbl[1] <- list(matrix(1:8, ncol = 2)))
 #> 4     4     8 h     <chr [1]>
 ```
 
-</td></tr><tr style="vertical-align:top"><td>
-
-
-</td><td>
-
-
 </td></tr><tr style="vertical-align:top"><td>
 
 ```r