diff --git a/.Rbuildignore b/.Rbuildignore index 4f36da32..4b8da244 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,8 +1,9 @@ +^CRAN-RELEASE$ ^.*\.Rproj$ ^\.Rproj\.user$ utils/* cran-comments.md docs/ -^\.travis\.yml$ ^codecov\.yml$ ^README\.Rmd$ +^.circleci/ diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..a20839f8 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,16 @@ +version: 2 +jobs: + build: + docker: + - image: rocker/verse:latest + + steps: + - checkout + + - run: + name: Runs tests / checks + command: Rscript -e "devtools::check()" + + - run: + name: Code Coverage + command: Rscript -e "covr::codecov()" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index aa918dd9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -# R for travis: see documentation at https://docs.travis-ci.com/user/languages/r - -language: R -sudo: false -cache: packages - -after_success: - - Rscript -e 'covr::codecov()' diff --git a/R/diffdf.R b/R/diffdf.R index 07e9ddbd..aa9d6a71 100644 --- a/R/diffdf.R +++ b/R/diffdf.R @@ -1,4 +1,3 @@ - #' diffdf #' @description #' Compares 2 dataframes and outputs any differences. diff --git a/README.md b/README.md index 6e97ce40..8355df94 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ [![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/diffdf)](https://CRAN.R-project.org/package=diffdf) -[![Travis build status](https://travis-ci.org/gowerc/diffdf.svg?branch=master)](https://travis-ci.org/gowerc/diffdf) +[![CircleCI](https://circleci.com/gh/gowerc/diffdf/tree/master.svg?style=svg)](https://circleci.com/gh/gowerc/diffdf/tree/master) [![Coverage status](https://codecov.io/gh/gowerc/diffdf/branch/master/graph/badge.svg)](https://codecov.io/github/gowerc/diffdf?branch=master) +[![Dependencies](https://tinyverse.netlify.com/badge/diffdf)](https://cran.r-project.org/package=diffdf) +[![Downloads](http://cranlogs.r-pkg.org/badges/diffdf?color=brightgreen)](http://www.r-pkg.org/pkg/diffdf) diff --git a/codecov.yml b/codecov.yml index 8f36b6cc..d3e0e442 100644 --- a/codecov.yml +++ b/codecov.yml @@ -5,8 +5,8 @@ coverage: project: default: target: auto - threshold: 1% + threshold: 4% patch: default: - target: auto - threshold: 1% + target: 65% + threshold: 0% diff --git a/diffdf.Rproj b/diffdf.Rproj index a4dce495..d95d9c72 100644 --- a/diffdf.Rproj +++ b/diffdf.Rproj @@ -1,8 +1,8 @@ Version: 1.0 -RestoreWorkspace: Default -SaveWorkspace: Default -AlwaysSaveHistory: Default +RestoreWorkspace: No +SaveWorkspace: No +AlwaysSaveHistory: No EnableCodeIndexing: Yes UseSpacesForTab: Yes diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 58701cf8..84b953c7 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -1,6 +1,6 @@ - + @@ -9,17 +9,17 @@ License • diffdf - + - - + + - + - + @@ -35,7 +35,8 @@ - + + + Introduction to diffdf • diffdf - - - + + + - @@ -22,14 +22,15 @@