Skip to content

Commit 62ef770

Browse files
authored
Merge branch 'main' into attributes
2 parents c342f92 + 8057b59 commit 62ef770

8 files changed

Lines changed: 35 additions & 66 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- {os: ubuntu-latest, r: 'release'}
2525
- {os: ubuntu-latest, r: 'oldrel-1'}
2626
# And minimum supported version in DESCRIPTION
27-
- {os: ubuntu-latest, r: '3.6.0'}
27+
- {os: ubuntu-latest, r: '4.1.0'}
2828

2929
env:
3030
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

CITATION.cff

Lines changed: 21 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ references:
6161
institution:
6262
name: R Foundation for Statistical Computing
6363
address: Vienna, Austria
64-
year: '2025'
65-
version: '>= 3.6.0'
64+
year: '2026'
65+
version: '>= 4.1.0'
6666
- type: software
6767
title: cli
6868
abstract: 'cli: Helpers for Developing Command Line Interfaces'
@@ -73,7 +73,7 @@ references:
7373
- family-names: Csárdi
7474
given-names: Gábor
7575
email: gabor@posit.co
76-
year: '2025'
76+
year: '2026'
7777
doi: 10.32614/CRAN.package.cli
7878
- type: software
7979
title: dplyr
@@ -98,7 +98,7 @@ references:
9898
given-names: Davis
9999
email: davis@posit.co
100100
orcid: https://orcid.org/0000-0003-4777-038X
101-
year: '2025'
101+
year: '2026'
102102
doi: 10.32614/CRAN.package.dplyr
103103
- type: software
104104
title: httr
@@ -110,7 +110,7 @@ references:
110110
- family-names: Wickham
111111
given-names: Hadley
112112
email: hadley@posit.co
113-
year: '2025'
113+
year: '2026'
114114
doi: 10.32614/CRAN.package.httr
115115
- type: software
116116
title: jsonlite
@@ -123,7 +123,7 @@ references:
123123
given-names: Jeroen
124124
email: jeroenooms@gmail.com
125125
orcid: https://orcid.org/0000-0002-4035-0289
126-
year: '2025'
126+
year: '2026'
127127
doi: 10.32614/CRAN.package.jsonlite
128128
- type: software
129129
title: lifecycle
@@ -139,7 +139,7 @@ references:
139139
given-names: Hadley
140140
email: hadley@posit.co
141141
orcid: https://orcid.org/0000-0003-4757-117X
142-
year: '2025'
142+
year: '2026'
143143
doi: 10.32614/CRAN.package.lifecycle
144144
- type: software
145145
title: purrr
@@ -155,7 +155,7 @@ references:
155155
- family-names: Henry
156156
given-names: Lionel
157157
email: lionel@posit.co
158-
year: '2025'
158+
year: '2026'
159159
doi: 10.32614/CRAN.package.purrr
160160
- type: software
161161
title: readr
@@ -173,7 +173,7 @@ references:
173173
given-names: Jennifer
174174
email: jenny@posit.co
175175
orcid: https://orcid.org/0000-0002-6983-2759
176-
year: '2025'
176+
year: '2026'
177177
doi: 10.32614/CRAN.package.readr
178178
version: '>= 2.1.0'
179179
- type: software
@@ -189,7 +189,7 @@ references:
189189
- family-names: Wickham
190190
given-names: Hadley
191191
email: hadley@posit.co
192-
year: '2025'
192+
year: '2026'
193193
doi: 10.32614/CRAN.package.rlang
194194
- type: software
195195
title: utils
@@ -200,42 +200,19 @@ references:
200200
institution:
201201
name: R Foundation for Statistical Computing
202202
address: Vienna, Austria
203-
year: '2025'
203+
year: '2026'
204204
- type: software
205205
title: yaml
206206
abstract: 'yaml: Methods to Convert R Data to YAML and Back'
207207
notes: Imports
208-
url: https://github.com/vubiostat/r-yaml/
208+
url: https://yaml.r-lib.org
209209
repository: https://CRAN.R-project.org/package=yaml
210210
authors:
211-
- family-names: Garbett
212-
given-names: Shawn P
213211
- family-names: Stephens
214212
given-names: Jeremy
215213
- family-names: Simonov
216214
given-names: Kirill
217-
- family-names: Xie
218-
given-names: Yihui
219-
- family-names: Dong
220-
given-names: Zhuoer
221-
- family-names: Wickham
222-
given-names: Hadley
223-
- family-names: Horner
224-
given-names: Jeffrey
225-
- name: reikoch
226-
- family-names: Beasley
227-
given-names: Will
228-
- family-names: O'Connor
229-
given-names: Brendan
230-
- family-names: Warnes
231-
given-names: Gregory R.
232-
- family-names: Quinn
233-
given-names: Michael
234-
- family-names: Kamvar
235-
given-names: Zhian N.
236-
- family-names: Gao
237-
given-names: Charlie
238-
year: '2025'
215+
year: '2026'
239216
doi: 10.32614/CRAN.package.yaml
240217
- type: software
241218
title: hms
@@ -248,7 +225,7 @@ references:
248225
given-names: Kirill
249226
email: kirill@cynkra.com
250227
orcid: https://orcid.org/0000-0002-1416-3412
251-
year: '2025'
228+
year: '2026'
252229
doi: 10.32614/CRAN.package.hms
253230
- type: software
254231
title: knitr
@@ -261,7 +238,7 @@ references:
261238
given-names: Yihui
262239
email: xie@yihui.name
263240
orcid: https://orcid.org/0000-0003-0645-5666
264-
year: '2025'
241+
year: '2026'
265242
doi: 10.32614/CRAN.package.knitr
266243
- type: software
267244
title: lubridate
@@ -277,7 +254,7 @@ references:
277254
given-names: Garrett
278255
- family-names: Wickham
279256
given-names: Hadley
280-
year: '2025'
257+
year: '2026'
281258
doi: 10.32614/CRAN.package.lubridate
282259
- type: software
283260
title: rmarkdown
@@ -321,7 +298,7 @@ references:
321298
given-names: Richard
322299
email: rich@posit.co
323300
orcid: https://orcid.org/0000-0003-3925-190X
324-
year: '2025'
301+
year: '2026'
325302
doi: 10.32614/CRAN.package.rmarkdown
326303
- type: software
327304
title: stringi
@@ -334,7 +311,7 @@ references:
334311
given-names: Marek
335312
email: marek@gagolewski.com
336313
orcid: https://orcid.org/0000-0003-0637-6028
337-
year: '2025'
314+
year: '2026'
338315
doi: 10.32614/CRAN.package.stringi
339316
- type: software
340317
title: testthat
@@ -346,7 +323,7 @@ references:
346323
- family-names: Wickham
347324
given-names: Hadley
348325
email: hadley@posit.co
349-
year: '2025'
326+
year: '2026'
350327
doi: 10.32614/CRAN.package.testthat
351328
version: '>= 3.0.0'
352329
- type: software
@@ -363,7 +340,7 @@ references:
363340
- family-names: Wickham
364341
given-names: Hadley
365342
email: hadley@rstudio.com
366-
year: '2025'
343+
year: '2026'
367344
doi: 10.32614/CRAN.package.tibble
368345
- type: software
369346
title: withr
@@ -388,6 +365,6 @@ references:
388365
email: hadley@posit.co
389366
- family-names: Chang
390367
given-names: Winston
391-
year: '2025'
368+
year: '2026'
392369
doi: 10.32614/CRAN.package.withr
393370

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ URL: https://github.com/frictionlessdata/frictionless-r,
3232
https://docs.ropensci.org/frictionless/
3333
BugReports: https://github.com/frictionlessdata/frictionless-r/issues
3434
Depends:
35-
R (>= 3.6.0)
35+
R (>= 4.1.0)
3636
Imports:
3737
cli,
3838
dplyr,
@@ -58,4 +58,4 @@ Config/testthat/edition: 3
5858
Encoding: UTF-8
5959
LazyData: true
6060
Roxygen: list(markdown = TRUE)
61-
RoxygenNote: 7.3.2
61+
RoxygenNote: 7.3.3

NEWS.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
* `resources()` is soft-deprecated, please use `resource_names()` instead (#282).
44
* `get_schema()` is soft-deprecated, please use `schema()` instead (#282).
55
* Internal properties (`package$directory` and `resource$read_from`) are now attributes rather than properties. This keeps them clearly separated from public Data Package properties. `read_from` is also renamed to `data_location` (#289).
6+
* `read_resource()` now supports reading from remote zip files, thanks to support in {vroom} (1.3.0) (#291).
7+
* frictionless now relies on R >= 4.1.0 (because of an indirect {vroom} dependency) (#291).
68

79
# frictionless 1.2.1
810

9-
* **frictionless now relies on R version 3.6.0 or higher**. Originally it stated version 3.5.0 or higher, but this was not tested and likely not true (#238).
11+
* frictionless now relies on R version 3.6.0 or higher. Originally it stated version 3.5.0 or higher, but this was not tested and likely not true (#238).
1012
* `read_package()` now returns a warning rather than an error when a `datapackage.json` contains no resources. This allows use to create the JSON and then add resources with frictionless (#265).
1113
* `example_package()` now has a `version` parameter, allowing to load the example Data Package following the Data Package [v1](https://specs.frictionlessdata.io/) or [v2](https://datapackage.org/) specification (#249).
1214

@@ -50,9 +52,9 @@
5052
* `cli::cli_abort()`, `cli::cli_warn()` and `cli::cli_inform()` are used for all errors, warnings, and messages (#163). This has several advantages:
5153
* Messages use semantic colours for variables, parameters, fields, etc.
5254
* Messages and warnings can be silenced with a global or local option, see [this blog post](https://ropensci.org/blog/2024/02/06/verbosity-control-packages/).
53-
* Each call has an [rlang](https://cran.r-project.org/package=rlang) class, e.g. `frictionless_error_fields_without_name`, making it easier to test for specific errors.
54-
* [glue](https://cran.r-project.org/package=glue) and [assertthat](https://cran.r-project.org/package=assertthat) are removed as dependencies (#163). The functionality of glue is replaced by cli, while `assertthat::assert()` calls are now `if ()` statements.
55-
* [rlang](https://cran.r-project.org/package=rlang) is added as dependency (#192). It is already used by other dependencies.
55+
* Each call has an `{rlang}` class, e.g. `frictionless_error_fields_without_name`, making it easier to test for specific errors.
56+
* `{glue}` and `{assertthat}` are removed as dependencies (#163). The functionality of glue is replaced by cli, while `assertthat::assert()` calls are now `if ()` statements.
57+
* `{rlang}` is added as dependency (#192). It is already used by other dependencies.
5658
* frictionless now depends on R >= 3.5.0.
5759

5860
## Other changes
@@ -62,7 +64,7 @@
6264

6365
# frictionless 1.0.3
6466

65-
* Add [stringi](https://cran.r-project.org/package=stringi) to `Suggests`. It was removed as a dependency from [rmarkdown](https://cran.r-project.org/package=rmarkdown) 2.26, resulting in "stringi package required for encoding operations" build errors on CRAN (#176).
67+
* Add `{stringi}` to `Suggests`. It was removed as a dependency from `{rmarkdown}` 2.26, resulting in "stringi package required for encoding operations" build errors on CRAN (#176).
6668

6769
# frictionless 1.0.2
6870

man/frictionless-package.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-read_resource.R

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -579,17 +579,7 @@ test_that("read_resource() can read compressed files", {
579579
)
580580

581581
expect_identical(read_resource(p_local_zip, "deployments"), resource)
582-
# Remote zip not supported, see
583-
# https://github.com/tidyverse/readr/issues/1042#issuecomment-545103047
584-
expect_error(
585-
read_resource(p_remote_zip, "deployments"),
586-
regexp = paste(
587-
"Reading from remote `zip` compressed files is not supported,",
588-
" download the files locally first.",
589-
sep = "\n"
590-
),
591-
fixed = TRUE
592-
)
582+
expect_identical(read_resource(p_remote_zip, "deployments"), resource)
593583
expect_identical(read_resource(p_local_gz, "deployments"), resource)
594584
expect_identical(read_resource(p_remote_gz, "deployments"), resource)
595585
})

vignettes/data-resource.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,4 @@ package$resources[[2]]$encoding
239239

240240
[`compression`](https://specs.frictionlessdata.io/patterns/#specification-3) (a recipe) is ignored by `read_resource()` and not set by `add_resource()`.
241241

242-
Compression is derived from the provided `path` instead. If the `path` ends in `.gz`, `.bz2`, `.xz`, or `.zip`, the files are automatically decompressed by `read_resource()` (using default `readr::read_delim()` functionality). Only `.gz` files can be read directly from URL `path`s.
242+
Compression is derived from the provided `path` instead. If the `path` ends in `.gz`, `.bz2`, `.xz`, or `.zip`, the files are automatically decompressed by `read_resource()` (using default `readr::read_delim()` functionality).

vignettes/table-schema.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ any other type | `any`
208208

209209
### integer
210210

211-
[`integer`](https://specs.frictionlessdata.io/table-schema/#integer) is interpreted as `double` (to avoid issues with big numbers). Or `factor` when `constraints$enum` is defined.
211+
[`integer`](https://specs.frictionlessdata.io/table-schema/#integer) is interpreted as `double` (to support big integers, + signs and `bareNumber`). Or `factor` when `constraints$enum` is defined.
212212

213213
- `bareNumber` is supported. If `false`, whitespace and non-numeric characters are ignored.
214214

0 commit comments

Comments
 (0)