Skip to content

Commit 3098247

Browse files
committed
Merge branch 'r-0.0-4' into production
2 parents fe6f3a7 + 252136a commit 3098247

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

DESCRIPTION

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: styler
22
Title: Non-invasive Pretty Printing of R code
3-
Version: 0.0-3
3+
Version: 0.0-4
44
Authors@R: person("Kirill", "Müller", role = c("aut", "cre"), email = "[email protected]")
55
Description:
66
Pretty-prints R code without changing the user's formatting intent.
@@ -13,10 +13,12 @@ Imports:
1313
tidyr,
1414
purrr,
1515
magrittr
16-
Suggests: testthat,
16+
Suggests:
17+
data.tree,
18+
here,
1719
knitr,
1820
rmarkdown,
19-
data.tree
21+
testthat
2022
Remotes:
2123
krlmlr/utf8
2224
License: GPL-3

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## styler 0.0-4 (2017-06-15)
2+
3+
- Fix `README.Rmd` for compatibility with pkgdown.
4+
5+
16
## styler 0.0-3 (2017-06-15)
27

38
- Technical release for creation of pkgdown documentation.

README.Rmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
output:
3-
md_document:
4-
variant: markdown_github
3+
github_document:
4+
html_preview: false
55
---
66

77
<!-- README.md is generated from README.Rmd. Please edit that file -->
@@ -39,7 +39,7 @@ print_code <- function(x) {
3939
collapse = "\n"))
4040
}
4141
42-
dirty <- readLines("tests/testthat/example/in.R")
42+
dirty <- readLines(here::here("tests/testthat/example/in.R"))
4343
4444
print_code(dirty)
4545
```

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
<!-- README.md is generated from README.Rmd. Please edit that file -->
23
styler
34
======
@@ -17,7 +18,7 @@ print_code <- function(x) {
1718
collapse = "\n"))
1819
}
1920

20-
dirty <- readLines("tests/testthat/example/in.R")
21+
dirty <- readLines(here::here("tests/testthat/example/in.R"))
2122

2223
print_code(dirty)
2324

0 commit comments

Comments
 (0)