Skip to content

Commit 32072ba

Browse files
krlmlrkrlmlr
committed
Merge branch 'r-1.1' into production
2 parents c1123d6 + b5a2c4a commit 32072ba

File tree

11 files changed

+123
-41
lines changed

11 files changed

+123
-41
lines changed

‎.Rbuildignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
^scripts/deploy-pages\.sh$
1919
^docs$
2020
^_pkgdown\.yml$
21+
^revdep$

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
inst/doc
55
/docs/
66
/vignettes/*.html
7+
/revdep/.cache.rds

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ addons:
2121
# Matrix: 3x Linux, 1x OS X
2222
matrix:
2323
include:
24-
- r: oldrel
2524
- r: release
2625
env:
2726
- DEPLOY_PAGES=true
2827
r_github_packages:
29-
- krlmlr/pkgdown@develop
28+
- hadley/pkgdown
3029
- krlmlr/travis@develop
3130
r_packages:
3231
- covr
3332
- roxygen2
33+
- r: oldrel
3434
- r: devel
3535
- os: osx
3636
osx_image: xcode7.2

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: rprojroot
22
Title: Finding Files in Project Subdirectories
3-
Version: 1.0-7
3+
Version: 1.1
44
Authors@R: person(given = "Kirill", family = "Müller", role = c("aut",
55
"cre"), email = "krlmlr+r@mailbox.org")
66
Description: Robust, reliable and flexible paths to files below a

‎NEWS.md‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,32 @@
1-
## rprojroot 1.0-7 (2016-10-23)
1+
# rprojroot 1.1 (2016-10-29)
22

3-
- New `is_testthat` and `find_testthat_root_file()` that looks for `tests/testthat` root (#14).
4-
- Improve navbar on project page.
5-
- Uses `backports` to simplify compatibility with R 3.0.0.
6-
- New `is_remake_project` and `find_remake_root_file()` that looks for remate project (#17).
3+
- Compatibility
4+
- Compatible with R >= 3.0.0 with the help of the `backports` package.
75

6+
- New root criteria
7+
- `is_remake_project` and `find_remake_root_file()` look for [remake](https://github.com/richfitz/remake) project (#17).
8+
- `is_testthat` and `find_testthat_root_file()` that looks for `tests/testthat` root (#14).
9+
- `from_wd`, useful for creating accessors to a known path (#11).
810

9-
## rprojroot 1.0-6 (2016-10-22)
11+
- Minor enhancement
12+
- Criteria can be combined with the `|` operator (#15).
1013

11-
- Travis tests three R versions, and OS X.
14+
- Documentation
15+
- Add package documentation with a few examples (#13).
16+
- Clarify difference between `find_file()` and `make_fix_file()` in vignette (#9).
17+
- Remove unexported functions from documentation and examples (#10).
18+
- Use `pkgdown` to create website.
1219

20+
- Testing
21+
- Use Travis instead of wercker. Travis tests three R versions, and OS X.
22+
- Improve AppVeyor testing.
1323

14-
## rprojroot 1.0-5 (2016-10-22)
1524

16-
- Use Travis instead of wercker.
17-
- Criteria can be combined with the `|` operator (#15).
18-
19-
20-
## rprojroot 1.0-4 (2016-05-30)
21-
22-
- Improve AppVeyor testing.
23-
- Restore compatibility with R < 3.2.
24-
- Add package documentation with a few examples (#13).
25-
26-
27-
## rprojroot 1.0-3 (2016-05-13)
28-
29-
- New root criterion `from_wd`, useful for creating accessors to a known path (#11).
30-
- Clarify difference between `find_file()` and `make_fix_file()` in vignette (#9).
31-
- Remove unexported functions from documentation and examples (#10).
32-
33-
34-
## rprojroot 1.0-2 (2016-03-28)
25+
# rprojroot 1.0-2 (2016-03-28)
3526

3627
- Fix test that fails on Windows only on CRAN.
3728

3829

39-
## rprojroot 1.0-1 (2016-03-26)
40-
41-
- Updated NEWS.
42-
43-
4430
# rprojroot 1.0 (2016-03-26)
4531

4632
Initial CRAN release.

‎cran-comments.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
## Test environments
2-
* local Ubuntu install, R 3.2.4
3-
* ubuntu 12.04 (on travis-ci), R 3.2.4
4-
* win-builder (devel and release)
2+
* local Ubuntu install, R 3.3.1
3+
* ubuntu 12.04 (on travis-ci, R devel, release, and oldrel)
4+
* OS X (on travis-ci, R release)
5+
win-builder (devel and release)
6+
57

68
## R CMD check results
79

8-
0 errors | 0 warnings | 1 note
10+
OK
11+
12+
* I don't see the warnings on R-devel with the updated version anymore.
913

10-
* 1 day since last update: Fix checks that fail on Windows.
1114

1215
## Reverse dependencies
1316

14-
No reverse dependencies yet.
17+
* I have run R CMD check on the 2 downstream dependencies, both were OK.

‎revdep/README.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Setup
2+
3+
## Platform
4+
5+
|setting |value |
6+
|:--------|:----------------------------|
7+
|version |R version 3.3.1 (2016-06-21) |
8+
|system |x86_64, linux-gnu |
9+
|ui |X11 |
10+
|language |en_US:en |
11+
|collate |en_US.UTF-8 |
12+
|tz |Europe/Busingen |
13+
|date |2016-10-29 |
14+
15+
## Packages
16+
17+
|package |* |version |date |source |
18+
|:---------|:--|:-------|:----------|:---------------------------|
19+
|backports | |1.0.3 |2016-06-28 |cran (@1.0.3) |
20+
|knitr | |1.14 |2016-08-13 |cran (@1.14) |
21+
|rmarkdown | |1.0 |2016-07-08 |cran (@1.0) |
22+
|rprojroot | |1.1 |2016-10-29 |local (krlmlr/rprojroot@NA) |
23+
|testthat | |1.0.2 |2016-04-23 |cran (@1.0.2) |
24+
|withr | |1.0.2 |2016-06-20 |cran (@1.0.2) |
25+
26+
# Check results
27+
28+
2 packages
29+
30+
|package |version | errors| warnings| notes|
31+
|:------------|:-------|------:|--------:|-----:|
32+
|googlesheets |0.2.1 | 0| 0| 0|
33+
|sparklyr |0.4 | 0| 0| 0|
34+
35+
## googlesheets (0.2.1)
36+
Maintainer: Jennifer Bryan <jenny@stat.ubc.ca>
37+
Bug reports: https://github.com/jennybc/googlesheets/issues
38+
39+
0 errors | 0 warnings | 0 notes
40+
41+
## sparklyr (0.4)
42+
Maintainer: Javier Luraschi <javier@rstudio.com>
43+
Bug reports: https://github.com/rstudio/sparklyr/issues
44+
45+
0 errors | 0 warnings | 0 notes
46+

‎revdep/check.R‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
library("devtools")
2+
3+
revdep_check()
4+
revdep_check_save_summary()
5+
revdep_check_print_problems()

‎revdep/checks.rds‎

815 Bytes
Binary file not shown.

‎revdep/problems.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Setup
2+
3+
## Platform
4+
5+
|setting |value |
6+
|:--------|:----------------------------|
7+
|version |R version 3.3.1 (2016-06-21) |
8+
|system |x86_64, linux-gnu |
9+
|ui |X11 |
10+
|language |en_US:en |
11+
|collate |en_US.UTF-8 |
12+
|tz |Europe/Busingen |
13+
|date |2016-10-29 |
14+
15+
## Packages
16+
17+
|package |* |version |date |source |
18+
|:---------|:--|:-------|:----------|:---------------------------|
19+
|backports | |1.0.3 |2016-06-28 |cran (@1.0.3) |
20+
|knitr | |1.14 |2016-08-13 |cran (@1.14) |
21+
|rmarkdown | |1.0 |2016-07-08 |cran (@1.0) |
22+
|rprojroot | |1.1 |2016-10-29 |local (krlmlr/rprojroot@NA) |
23+
|testthat | |1.0.2 |2016-04-23 |cran (@1.0.2) |
24+
|withr | |1.0.2 |2016-06-20 |cran (@1.0.2) |
25+
26+
# Check results
27+
28+
0 packages with problems
29+
30+
31+
32+

0 commit comments

Comments
 (0)