Skip to content

Commit

Permalink
Merge branch 'r-1.1' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Nov 6, 2016
2 parents c1123d6 + b5a2c4a commit 32072ba
Show file tree
Hide file tree
Showing 11 changed files with 123 additions and 41 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
^scripts/deploy-pages\.sh$
^docs$
^_pkgdown\.yml$
^revdep$
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
inst/doc
/docs/
/vignettes/*.html
/revdep/.cache.rds
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ addons:
# Matrix: 3x Linux, 1x OS X
matrix:
include:
- r: oldrel
- r: release
env:
- DEPLOY_PAGES=true
r_github_packages:
- krlmlr/pkgdown@develop
- hadley/pkgdown
- krlmlr/travis@develop
r_packages:
- covr
- roxygen2
- r: oldrel
- r: devel
- os: osx
osx_image: xcode7.2
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: rprojroot
Title: Finding Files in Project Subdirectories
Version: 1.0-7
Version: 1.1
Authors@R: person(given = "Kirill", family = "Müller", role = c("aut",
"cre"), email = "krlmlr+r@mailbox.org")
Description: Robust, reliable and flexible paths to files below a
Expand Down
50 changes: 18 additions & 32 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,32 @@
## rprojroot 1.0-7 (2016-10-23)
# rprojroot 1.1 (2016-10-29)

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

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

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

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

- Testing
- Use Travis instead of wercker. Travis tests three R versions, and OS X.
- Improve AppVeyor testing.

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

- Use Travis instead of wercker.
- Criteria can be combined with the `|` operator (#15).


## rprojroot 1.0-4 (2016-05-30)

- Improve AppVeyor testing.
- Restore compatibility with R < 3.2.
- Add package documentation with a few examples (#13).


## rprojroot 1.0-3 (2016-05-13)

- New root criterion `from_wd`, useful for creating accessors to a known path (#11).
- Clarify difference between `find_file()` and `make_fix_file()` in vignette (#9).
- Remove unexported functions from documentation and examples (#10).


## rprojroot 1.0-2 (2016-03-28)
# rprojroot 1.0-2 (2016-03-28)

- Fix test that fails on Windows only on CRAN.


## rprojroot 1.0-1 (2016-03-26)

- Updated NEWS.


# rprojroot 1.0 (2016-03-26)

Initial CRAN release.
Expand Down
15 changes: 9 additions & 6 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
## Test environments
* local Ubuntu install, R 3.2.4
* ubuntu 12.04 (on travis-ci), R 3.2.4
* win-builder (devel and release)
* local Ubuntu install, R 3.3.1
* ubuntu 12.04 (on travis-ci, R devel, release, and oldrel)
* OS X (on travis-ci, R release)
win-builder (devel and release)


## R CMD check results

0 errors | 0 warnings | 1 note
OK

* I don't see the warnings on R-devel with the updated version anymore.

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

## Reverse dependencies

No reverse dependencies yet.
* I have run R CMD check on the 2 downstream dependencies, both were OK.
46 changes: 46 additions & 0 deletions revdep/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Setup

## Platform

|setting |value |
|:--------|:----------------------------|
|version |R version 3.3.1 (2016-06-21) |
|system |x86_64, linux-gnu |
|ui |X11 |
|language |en_US:en |
|collate |en_US.UTF-8 |
|tz |Europe/Busingen |
|date |2016-10-29 |

## Packages

|package |* |version |date |source |
|:---------|:--|:-------|:----------|:---------------------------|
|backports | |1.0.3 |2016-06-28 |cran (@1.0.3) |
|knitr | |1.14 |2016-08-13 |cran (@1.14) |
|rmarkdown | |1.0 |2016-07-08 |cran (@1.0) |
|rprojroot | |1.1 |2016-10-29 |local (krlmlr/rprojroot@NA) |
|testthat | |1.0.2 |2016-04-23 |cran (@1.0.2) |
|withr | |1.0.2 |2016-06-20 |cran (@1.0.2) |

# Check results

2 packages

|package |version | errors| warnings| notes|
|:------------|:-------|------:|--------:|-----:|
|googlesheets |0.2.1 | 0| 0| 0|
|sparklyr |0.4 | 0| 0| 0|

## googlesheets (0.2.1)
Maintainer: Jennifer Bryan <jenny@stat.ubc.ca>
Bug reports: https://github.com/jennybc/googlesheets/issues

0 errors | 0 warnings | 0 notes

## sparklyr (0.4)
Maintainer: Javier Luraschi <javier@rstudio.com>
Bug reports: https://github.com/rstudio/sparklyr/issues

0 errors | 0 warnings | 0 notes

5 changes: 5 additions & 0 deletions revdep/check.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
library("devtools")

revdep_check()
revdep_check_save_summary()
revdep_check_print_problems()
Binary file added revdep/checks.rds
Binary file not shown.
32 changes: 32 additions & 0 deletions revdep/problems.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Setup

## Platform

|setting |value |
|:--------|:----------------------------|
|version |R version 3.3.1 (2016-06-21) |
|system |x86_64, linux-gnu |
|ui |X11 |
|language |en_US:en |
|collate |en_US.UTF-8 |
|tz |Europe/Busingen |
|date |2016-10-29 |

## Packages

|package |* |version |date |source |
|:---------|:--|:-------|:----------|:---------------------------|
|backports | |1.0.3 |2016-06-28 |cran (@1.0.3) |
|knitr | |1.14 |2016-08-13 |cran (@1.14) |
|rmarkdown | |1.0 |2016-07-08 |cran (@1.0) |
|rprojroot | |1.1 |2016-10-29 |local (krlmlr/rprojroot@NA) |
|testthat | |1.0.2 |2016-04-23 |cran (@1.0.2) |
|withr | |1.0.2 |2016-06-20 |cran (@1.0.2) |

# Check results

0 packages with problems




8 changes: 8 additions & 0 deletions revdep/timing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Check times

| |package |version | check_time|
|:--|:------------|:-------|----------:|
|2 |sparklyr |0.4 | 34.4|
|1 |googlesheets |0.2.1 | 33.1|


0 comments on commit 32072ba

Please sign in to comment.