Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Circle #27

Merged
merged 10 commits into from
Mar 26, 2019
Merged

Circle #27

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4dd60c7
Merge pull request #22 from gowerc/hotfix_rng
kieranjmartin Mar 12, 2019
7a03a67
Merge pull request #24 from gowerc/hotfix_rng
gowerc Mar 12, 2019
2fa86f3
Switched Travis to Circle
gowerc-work Mar 23, 2019
cea9981
left over stuff that I had previous forgot to commit
gowerc-work Mar 23, 2019
5e1e015
updated pkgdown site
gowerc-work Mar 23, 2019
5d24fd4
minor edit to trigger ci
gowerc-work Mar 23, 2019
02ff780
updated codecov
gowerc-work Mar 23, 2019
9943665
Updated Badges
gowerc Mar 26, 2019
958cd23
removed redundant file
gowerc-work Mar 26, 2019
e210851
Merge branch 'master' into circle
gowerc-work Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .Rbuildignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
^CRAN-RELEASE$
^.*\.Rproj$
^\.Rproj\.user$
utils/*
cran-comments.md
docs/
^\.travis\.yml$
^codecov\.yml$
^README\.Rmd$
^.circleci/
16 changes: 16 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()"
8 changes: 0 additions & 8 deletions .travis.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions CRAN-RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This package was submitted to CRAN on 2019-03-12.
Once it is accepted, delete this file and tag the release (commit 7a03a6791b).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So should this be here?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this file in latest commit

1 change: 0 additions & 1 deletion R/diffdf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#' diffdf
#' @description
#' Compares 2 dataframes and outputs any differences.
Expand Down
6 changes: 3 additions & 3 deletions codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ coverage:
project:
default:
target: auto
threshold: 1%
threshold: 4%
patch:
default:
target: auto
threshold: 1%
target: 65%
threshold: 0%
6 changes: 3 additions & 3 deletions diffdf.Rproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Version: 1.0

RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default
RestoreWorkspace: No
SaveWorkspace: No
AlwaysSaveHistory: No

EnableCodeIndexing: Yes
UseSpacesForTab: Yes
Expand Down
23 changes: 12 additions & 11 deletions docs/LICENSE-text.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading