Skip to content

Commit

Permalink
Merge pull request #24 from wibeasley/master
Browse files Browse the repository at this point in the history
replace 'ghit' package with 'remotes'
  • Loading branch information
pdurbin committed Nov 4, 2019
2 parents ac67f0f + 4c809bf commit bac89f4
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 36 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ man-roxygen/*
\.Rmd2$
.github/
.github/*
^doc$
^Meta$
^codecov\.yml$
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
README.html
doc
Meta
32 changes: 10 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# Travis's native R Image (http://docs.travis-ci.com/user/languages/r/)
language: r
sudo: false
cache: packages
warnings_are_errors: true

matrix:
include:
- os: linux
dist: precise
sudo: false
r_build_args: '--no-build-vignettes'
r_check_args: '--ignore-vignettes --no-examples'
- os: linux
dist: trusty
sudo: required
dist: xenial
env: R_CODECOV=true
- os: linux
dist: bionic
- os: osx
osx_image: xcode8.2
before_install:
Expand All @@ -20,21 +19,10 @@ matrix:
latex: false
r_build_args: '--no-build-vignettes'
r_check_args: '--ignore-vignettes --no-examples'
- os: osx
osx_image: xcode7.3
latex: false
r_build_args: '--no-build-vignettes'
r_check_args: '--ignore-vignettes --no-examples'

r_packages:
- covr
- rmarkdown
- knitr
r_github_packages:
- r-lib/covr

after_success:
- if [[ "${R_CODECOV}" ]]; then R -e 'covr::codecov()'; fi

notifications:
email:
on_success: change
on_failure: change
- if [[ "${R_CODECOV}" ]]; then Rscript -e 'covr::codecov()'; fi
# - Rscript -e 'covr::coveralls()'
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ Suggests:
knitr,
testthat,
UNF,
foreign
foreign,
covr
Description: Provides access to Dataverse version 4 APIs <https://dataverse.org/>,
enabling data search, retrieval, and deposit. For Dataverse versions <= 4.0,
use the deprecated 'dvn' package <https://cran.r-project.org/package=dvn>.
License: GPL-2
URL: https://github.com/iqss/dataverse-client-r
BugReports: https://github.com/iqss/dataverse-client-r/issues
VignetteBuilder: knitr
RoxygenNote: 6.0.1
Encoding: UTF-8
RoxygenNote: 6.1.1
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* Pass `key`, `server`, and `...` arguments to internal `get_dataverse()` and `get_dataset()` calls.
* Tests now run with an explicit empty API key.
* Fixed a bug in internal function `parse_dataset()`, related to capitalization. (#17)
* Vignette uses 'remotes' package in place of the archived 'ghit' package. (#24 @wibeasley)
* Updated config for Travis-CI, such as switch to xenial Ubuntu release, specify repo's org, and specify covr parameters. (#25 @wibeasley)

# CHANGES TO dataverse 0.1.24

Expand Down
12 changes: 12 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
comment: false

coverage:
status:
project:
default:
target: auto
threshold: 1%
patch:
default:
target: auto
threshold: 1%
4 changes: 2 additions & 2 deletions man/files.Rd

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

3 changes: 2 additions & 1 deletion man/get_dataset.Rd

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

3 changes: 2 additions & 1 deletion man/get_user_key.Rd

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

3 changes: 2 additions & 1 deletion man/initiate_sword_dataset.Rd

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

3 changes: 2 additions & 1 deletion man/publish_dataset.Rd

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

6 changes: 3 additions & 3 deletions vignettes/A-introduction.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ They can be accessed from [CRAN](https://cran.r-project.org/package=dataverse) o
The dataverse client package can be installed from [CRAN](https://cran.r-project.org/package=dataverse), and you can find the latest development version and report any issues on GitHub:

```R
if (!require("ghit")) {
install.packages("ghit")
if (!require("remotes")) {
install.packages("remotes")
}
ghit::install_github("iqss/dataverse-client-r")
remotes::install_github("iqss/dataverse-client-r")
library("dataverse")
```

Expand Down
6 changes: 3 additions & 3 deletions vignettes/A-introduction.Rmd2
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ They can be accessed from [CRAN](https://cran.r-project.org/package=dataverse) o
The dataverse client package can be installed from [CRAN](https://cran.r-project.org/package=dataverse), and you can find the latest development version and report any issues on GitHub:

```R
if (!require("ghit")) {
install.packages("ghit")
if (!require("remotes")) {
install.packages("remotes")
}
ghit::install_github("iqss/dataverse-client-r")
remotes::install_github("iqss/dataverse-client-r")
library("dataverse")
```

Expand Down

0 comments on commit bac89f4

Please sign in to comment.