Skip to content

Commit

Permalink
Merge pull request #387 from ropensci/yaml
Browse files Browse the repository at this point in the history
Yaml
  • Loading branch information
elinw authored Feb 3, 2019
2 parents a1d18f1 + 8904b4a commit 7938de5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sudo: required
warnings_are_errors: true
env:
global:
- NOT_CRAN=false
- NOT_CRAN=true
before_install:
- echo "options(repos = c(CRAN='http://cran.rstudio.com'))" > ~/.Rprofile
r_github_packages:
Expand Down
11 changes: 6 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,24 @@ Depends:
R (>= 3.1.2)
Imports:
cli,
dplyr (>= 0.8),
magrittr,
dplyr (>= 0.8.0),
magrittr (>= 1.5),
pander,
purrr,
rlang,
rlang (>= 0.3.1),
stats,
stringr (>= 1.1),
knitr (>= 1.2),
tibble (>= 0.6),
tibble (>= 2.0.0),
tidyr (>= 0.7),
tidyselect (>= 0.2.4)
tidyselect (>= 0.2.5)
Suggests:
extrafont,
rmarkdown,
testthat (>= 2.0.0),
withr,
covr
Remotes: tidyverse/dplyr
License: GPL-3
Encoding: UTF-8
LazyData: true
Expand Down
4 changes: 3 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@ install:
# Adapt as necessary starting from here

build_script:
- travis-tool.sh install_github r-lib/devtools
- travis-tool.sh install_deps
- travis-tool.sh install_github tidyverse/dplyr

environment:
global:
USE_RTOOLS: true
NOT_CRAN: true
matrix:
- R_ARCH: i386
GCC_PATH: mingw_32
- R_ARCH: x64
GCC_PATH: mingw_64

test_script:
- travis-tool.sh run_tests

Expand Down
7 changes: 1 addition & 6 deletions man/deprecated-v1.Rd

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

0 comments on commit 7938de5

Please sign in to comment.