Skip to content

support for r 3.0.0 #87

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

Open
javierluraschi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

support for r 3.0.0 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
383efe2
support for r 3.0.0
javierluraschi Nov 2, 2016
fc8a7ef
remove use of shallow_duplicate for suplicate
javierluraschi Nov 2, 2016
c90aa66
try .travis.yml feedback
javierluraschi Nov 3, 2016
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
13 changes: 10 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,16 @@ language: r
sudo: false
cache: packages
r:
- oldrel
- release
- devel
- 3.0.3
- oldrel
- release
- devel

before_install:
- if [[ "$TRAVIS_R_VERSION_STRING" = '3.0.3' ]]; then git clone https://github.com/hadley/devtools ~/devtools && pushd ~/devtools && git fetch origin pull/1388/head:3.0.3 && git checkout 3.0.3 && R CMD build . && R CMD INSTALL devtools*tar.gz && popd;fi

install:
- R -e 'devtools::install_deps(dep = T)'

after_success:
- Rscript -e 'covr::codecov(line_exclusions = c("R/lazy.R", "R/lazy-as.R", "R/lazy-dots.R", "R/lazy-names.R", "R/lazy-call.R", "R/lazy-eval.R", "R/lazy-interp.R", "src/lazy.c"))'
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: lazyeval
Version: 0.2.0.9000
Version: 0.2.0.9001
Title: Lazy (Non-Standard) Evaluation
Description: An alternative approach to non-standard evaluation using
formulas. Provides a full implementation of LISP style 'quasiquotation',
Expand All @@ -11,7 +11,7 @@ Authors@R: c(
License: GPL-3
LazyData: true
Depends:
R (>= 3.1.0)
R (>= 3.0.0)
Copy link
Owner

@hadley hadley Nov 2, 2016

Choose a reason for hiding this comment

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

Can you please also modify the travis file to enforce this? (Ask @jimhester for details)

Copy link
Contributor

@jimhester jimhester Nov 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

The earliest travis version available on travis is 3.0.3, however there was a devtools bug in the CRAN version that prevents installation of packages with 3.0.3 (https://travis-ci.org/hadley/devtools/jobs/172912550#L1115). You will need to install devel devtools manually by adding something like the following to .travis.yml (untested).

r:
 - 3.0.3
 - oldrel
 - release
 - devel

before_install:
  - if [[ "$TRAVIS_R_VERSION_STRING" = '3.0.3' ]]; then git clone https://github.com/hadley/devtools ~/devtools && pushd ~/devtools && git fetch origin pull/1388/head:3.0.3 && git checkout 3.0.3 && R CMD build . && R CMD INSTALL devtools*tar.gz && popd;fi

install:
  - R -e 'devtools::install_deps(dep = T)'

Suggests:
knitr,
rmarkdown (>= 0.2.65),
Expand Down
2 changes: 1 addition & 1 deletion src/name.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SEXP lhs_name(SEXP x) {
Rf_errorcall(R_NilValue, "`x` must be a list (not a %s)", Rf_type2char(TYPEOF(x)));

int n = Rf_length(x);
SEXP x2 = PROTECT(Rf_shallow_duplicate(x));
SEXP x2 = PROTECT(Rf_duplicate(x));
Copy link

@krlmlr krlmlr Jan 9, 2017

Choose a reason for hiding this comment

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

Can we use Rf_shallow_duplicate() if it is available? In this case any potential regressions are limited to R 3.0 users. We should then also check if the R version lazyeval was built with a different R version in .onLoad().


SEXP names = Rf_getAttrib(x2, R_NamesSymbol);
if (names == R_NilValue) {
Expand Down