Skip to content

Commit 9a5d256

Browse files
Merge pull request #930 from r-lib/rc-1.7.0
Release {styler} 1.7.0
2 parents afc969b + 795b4a4 commit 9a5d256

File tree

8 files changed

+32
-28
lines changed

8 files changed

+32
-28
lines changed

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: styler
33
Title: Non-Invasive Pretty Printing of R Code
4-
Version: 1.6.2.9000
4+
Version: 1.7.0
55
Authors@R:
66
c(person(given = "Kirill",
77
family = "Müller",
@@ -19,7 +19,7 @@ BugReports: https://github.com/r-lib/styler/issues
1919
Depends:
2020
R (>= 3.4.0)
2121
Imports:
22-
cli (>= 1.1.0),
22+
cli (>= 3.1.1),
2323
magrittr (>= 2.0.0),
2424
purrr (>= 0.2.3),
2525
R.cache (>= 0.15.0),

NEWS.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# styler 1.6.2.9000 (Development version)
1+
# styler 1.7.0
22

33
**API changes**
44

@@ -47,10 +47,10 @@
4747
there are comments and line breaks under certain circumstances (#905).
4848
* rules that add tokens don't break stylerignore sequences anymore (#891).
4949
* Alignment detection respects stylerignore (#850).
50-
* `~` causes now indention, like `+`, `-`, `|` etc. (#902).
51-
* `Warning: Unknown or uninitialised column:` was fixed (#885).
5250
* Unaligned expressions with quoted key (e.g. `c("x" = 2)`) are now correctly
5351
detected (#881).
52+
* `~` causes now indention, like `+`, `-`, `|` etc. (#902).
53+
* `Warning: Unknown or uninitialised column:` was fixed (#885).
5454
* function calls with unequal number of token on different lines are no longer
5555
deemed aligned if there are arbitrary spaces around the tokens on the lines
5656
with most tokens (#902).
@@ -86,6 +86,10 @@
8686
* {styler} test are relaxed to not assume a specific error message on the
8787
wrong usage of `_` (#929).
8888

89+
Thanks to all contributors that made this release possible:
90+
91+
[@bersbersbers](https://github.com/bersbersbers), [@daniel-wrench](https://github.com/daniel-wrench), [@dbykova](https://github.com/dbykova), [@EngrStudent](https://github.com/EngrStudent), [@hadley](https://github.com/hadley), [@IndrajeetPatil](https://github.com/IndrajeetPatil), [@jam1015](https://github.com/jam1015), [@jooyoungseo](https://github.com/jooyoungseo), [@kalaschnik](https://github.com/kalaschnik), [@kaytif](https://github.com/kaytif), [@kpagacz](https://github.com/kpagacz), [@krlmlr](https://github.com/krlmlr), [@lionel-](https://github.com/lionel-), [@lorenzwalthert](https://github.com/lorenzwalthert), [@maelle](https://github.com/maelle), [@MichaelChirico](https://github.com/MichaelChirico), [@mine-cetinkaya-rundel](https://github.com/mine-cetinkaya-rundel), [@neuwirthe](https://github.com/neuwirthe), [@Polkas](https://github.com/Polkas), [@pwang2](https://github.com/pwang2), [@sebffischer](https://github.com/sebffischer), [@ShixiangWang](https://github.com/ShixiangWang), [@ssh352](https://github.com/ssh352), and [@xjtusjtu](https://github.com/xjtusjtu).
92+
8993
# styler 1.6.2
9094

9195
* clean up cache files older than one week (#842).
@@ -589,7 +593,7 @@ Thanks to all contributors involved, in particular
589593
[@tvatter](https://github.com/tvatter),
590594
[@wdearden](https://github.com/wdearden),
591595
[@wmayner](https://github.com/wmayner), and
592-
[@yech1990](https://github.com/yech1990).
596+
@yech1990.
593597

594598
# styler 1.1.0
595599

R/zzz.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
ask_to_switch_to_non_default_cache_root <- function(ask = interactive()) {
23-
if (ask && runif(1) > 0.9 && is.null(getOption("styler.cache_root"))) {
23+
if (ask && stats::runif(1) > 0.9 && is.null(getOption("styler.cache_root"))) {
2424
ask_to_switch_to_non_default_cache_root_impl()
2525
options(styler.cache_root = "styler")
2626
}

README.Rmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ knitr::opts_chunk$set(
1919
<!-- badges: start -->
2020
[![R build status](https://github.com/r-lib/styler/workflows/R-CMD-check/badge.svg)](https://github.com/r-lib/styler/actions)
2121
[![Life cycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
22-
[![codecov test coverage](https://codecov.io/gh/r-lib/styler/branch/main/graph/badge.svg)](https://codecov.io/gh/r-lib/styler)
22+
[![codecov test coverage](https://app.codecov.io/gh/r-lib/styler/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/styler)
2323
[![CRAN Status](https://www.r-pkg.org/badges/version/styler)](https://cran.r-project.org/package=styler)
2424
<!-- badges: end -->
2525

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ status](https://github.com/r-lib/styler/workflows/R-CMD-check/badge.svg)](https:
1010
[![Life cycle:
1111
stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
1212
[![codecov test
13-
coverage](https://codecov.io/gh/r-lib/styler/branch/main/graph/badge.svg)](https://codecov.io/gh/r-lib/styler)
13+
coverage](https://app.codecov.io/gh/r-lib/styler/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r-lib/styler)
1414
[![CRAN
1515
Status](https://www.r-pkg.org/badges/version/styler)](https://cran.r-project.org/package=styler)
1616
<!-- badges: end -->

cran-comments.md

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
This is a re-submission to fix a problem with persistent caching. Note that
2-
all cached files are of size 0 and this is by design to keep the cache small.
3-
Hence, the cache will still have files of size 0, but we remove all files older
4-
than a week and remove all caches for versions of styler other than the one
5-
running as requested.
1+
This release does not check for a specific error message from `parse()` anymore
2+
when the input involves unparsable use of `_`. The release was requested by Luke
3+
Tierney.
64

75
## Test environments
86

9-
* local OS X install (10.15.7): R 4.1.0
10-
* ubuntu 18.04 (on GitHub Actions): R devel, R 4.1.1, R 4.0.5, R 3.6, R 3.5, R 3.4
7+
8+
* ubuntu 18.04 (on GitHub Actions): R devel, R 4.1.2, R 4.0.5, R 3.6, R 3.5, R 3.4
119
* Windows Server 10 (on GitHub Actions): R 3.6, R 4.0.5
1210
* win-builder: R devel
1311

@@ -39,15 +37,13 @@ downstream dependencies are:
3937

4038
* Reverse imports: biocthis, boomer, exampletestr, flow, iNZightTools,
4139
languageserver, questionr, shinymeta, shinyobjects, ShinyQuickStarter,
42-
systemPipeShiny, tidypaleo
40+
systemPipeShiny, tidypaleo.
41+
4342

44-
* Reverse suggests: autothresholdr, autothresholdr, crunch, datastructures,
45-
drake, epigraphdb, knitr, multiverse, nph, precommit, reprex, shiny.react,
46-
shinydashboardPlus, shinyMonacoEditor, usethis.
47-
43+
* Reverse suggests: admiral, autothresholdr, crunch, datastructures, drake,
44+
epigraphdb, ghclass, knitr, multiverse, nph, precommit, reprex, shiny.react,
45+
shinydashboardPlus, shinyMonacoEditor, upsetjs, usethis.
4846

4947

50-
All of them finished R CMD CHECK with the same number of ERRORS, WARNINGS and
51-
NOTES as with the current CRAN version of styler, which means the new
52-
submission of styler does not introduce any ERRORS, WARNINGS and NOTES in
53-
downstream dependencies.
48+
All of them finished R CMD CHECK with zero (0) ERRORS, WARNINGS and
49+
NOTES.

inst/WORDLIST

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ getChecksum
7070
getOption
7171
getRversion
7272
ggplot
73+
ghclass
7374
github
7475
gitsum
7576
grkstyle
@@ -236,6 +237,7 @@ tidypaleo
236237
tidyr
237238
tidyverse
238239
Tidyverse
240+
Tierney
239241
tokenized
240242
travis
241243
tryCatch
@@ -250,7 +252,9 @@ unindention
250252
unlink
251253
unlinkunindention
252254
unnest
255+
unparsable
253256
unstyled
257+
upsetjs
254258
usethis
255259
utf
256260
Uwe

vignettes/remove_rules.Rmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you want to change the behavior of styler to match your desired style, there
2222
are multiple ways:
2323

2424
- Use the tidyverse style guide, but not with the default options. Starting
25-
point for this approach is the [help file](http://styler.r-lib.org/reference/tidyverse_style.html) for
25+
point for this approach is the [help file](https://styler.r-lib.org/reference/tidyverse_style.html) for
2626
the function `tidyverse_style()`, which returns the transformer functions that
2727
prettify your code. Most of these options are explained in `vignette("styler")`.
2828

@@ -77,7 +77,7 @@ names(transformers)
7777
```
7878

7979
From the aforementioned
80-
[vignette](http://styler.r-lib.org/articles/customizing_styler.html):
80+
[vignette](https://styler.r-lib.org/articles/customizing_styler.html):
8181

8282
> We note that there are different types of transformer functions. initialize
8383
initializes some variables in the nested parse table (so it is not actually a
@@ -187,7 +187,7 @@ is code that will have the first empty line in the function body removed by styl
187187
`transformers$space$start_comments_with_space`
188188

189189
I think you get the idea. I nevertheless recommend using the [tidyverse style
190-
guide](http://style.tidyverse.org/) as is since
190+
guide](https://style.tidyverse.org/) as is since
191191

192192
- it is a well-established, thought-through style.
193193

0 commit comments

Comments
 (0)