Skip to content

Commit e8e2b55

Browse files
committed
Merge branch 'cran-2.0.0'
2 parents cbd03d8 + b5d7d8d commit e8e2b55

File tree

8 files changed

+46
-14
lines changed

8 files changed

+46
-14
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
^README\.Rmd$
1212
^TODO\.md$
1313
^CRAN-RELEASE$
14+
^codecov\.yml$

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ BugReports: https://github.com/r-lib/rprojroot/issues
1717
Depends:
1818
R (>= 3.0.0)
1919
Suggests:
20+
covr,
2021
knitr,
2122
lifecycle,
2223
mockr,

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ rlang::local_interactive(FALSE)
1919
<!-- badges: start -->
2020
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable)
2121
[![rcc](https://github.com/r-lib/rprojroot/workflows/rcc/badge.svg)](https://github.com/r-lib/rprojroot/actions)
22-
[![codecov.io](https://codecov.io/github/r-lib/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/r-lib/rprojroot?branch=master)
2322
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
23+
[![Codecov test coverage](https://codecov.io/gh/r-lib/rprojroot/branch/master/graph/badge.svg)](https://codecov.io/gh/r-lib/rprojroot?branch=master)
2424
<!-- badges: end -->
2525

2626
This package helps accessing files relative to a *project root* to [stop the working directory insanity](https://gist.github.com/jennybc/362f52446fe1ebc4c49f).

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
<!-- badges: start -->
66

7-
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable)
8-
[![rcc](https://github.com/r-lib/rprojroot/workflows/rcc/badge.svg)](https://github.com/r-lib/rprojroot/actions) [![codecov.io](https://codecov.io/github/r-lib/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/r-lib/rprojroot?branch=master) [![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
7+
[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable) [![rcc](https://github.com/r-lib/rprojroot/workflows/rcc/badge.svg)](https://github.com/r-lib/rprojroot/actions) [![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot) [![Codecov test coverage](https://codecov.io/gh/r-lib/rprojroot/branch/master/graph/badge.svg)](https://codecov.io/gh/r-lib/rprojroot?branch=master)
98

109
<!-- badges: end -->
1110

codecov.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
comment: false
2+
3+
coverage:
4+
status:
5+
project:
6+
default:
7+
target: auto
8+
threshold: 1%
9+
informational: true
10+
patch:
11+
default:
12+
target: auto
13+
threshold: 1%
14+
informational: true

cran-comments.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
Resumbission upon CRAN's request, to fix brittle tests (again).
1+
rprojroot 2.0.0
22

3-
## Test environments
4-
* local Ubuntu install, R 3.4.3
5-
* ubuntu 14.04 (on travis-ci, R devel, release, and oldrel)
6-
* OS X (on travis-ci, R release)
7-
* win-builder (devel and release)
3+
## Cran Repository Policy
84

5+
- [x] Reviewed CRP last edited 2020-10-29.
96

107
## R CMD check results
118

12-
* "Subdirectories" is spelled correctly.
9+
- [x] Checked locally, R 4.0.3
10+
- [x] Checked on CI system, R 4.0.3
11+
- [x] Checked on win-builder, R devel
1312

13+
## Current CRAN check results
1414

15-
## Reverse dependencies
16-
17-
* I have run R CMD check on the 21 downstream dependencies, same check results for current CRAN version and release candidate.
15+
- [x] Checked on 2020-11-12, no problems found.

inst/WORDLIST

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Acknowledgement
2+
AppVeyor
3+
Codecov
4+
Hadley
5+
Lifecycle
6+
ORCID
7+
RStudio
8+
Wickham
9+
backports
10+
kimisc
11+
knitr
12+
pandoc
13+
rcc
14+
readxl
15+
rmarkdown
16+
testthat
17+
tidyverse
18+
wercker
19+
whereami

vignettes/rprojroot.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ rel_path_from_root <- find_root_file("R", "rrmake.R", criterion = has_file("DESC
210210
Since Examples A and B used different working directories, `rel_path_from_vignettes` and `rel_path_from_testthat` were different. This is an issue when trying to re-use the same code. This issue is solved by using *rprojroot*: the function `find_root_file()` finds a file relative from the root, where the root is determined from checking the criterion with `has_file()`.
211211

212212

213-
Note that the follow code produces identical results when building the vignette *and* when sourcing the chunk in RStudio, provided that the current working directory is the project root or anywhere below. So, we can check to make sure that *rprojroot* has succesfully determined the correct path:
213+
Note that the follow code produces identical results when building the vignette *and* when sourcing the chunk in RStudio, provided that the current working directory is the project root or anywhere below. So, we can check to make sure that *rprojroot* has successfully determined the correct path:
214214

215215
```{r}
216216
# Specify a path/to/file relative to the root

0 commit comments

Comments
 (0)