From 5cfd7980082c49b3514450f1478581b16c5f667f Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 25 Feb 2022 12:00:59 +0100 Subject: [PATCH] handle r version unspecified in environment.yml --- repo2docker/buildpacks/_r_base.py | 2 +- tests/conda/r-unspecified/environment.yml | 3 +++ tests/conda/r-unspecified/verify | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 tests/conda/r-unspecified/environment.yml create mode 100755 tests/conda/r-unspecified/verify diff --git a/repo2docker/buildpacks/_r_base.py b/repo2docker/buildpacks/_r_base.py index 5e14f3c9..3e360558 100644 --- a/repo2docker/buildpacks/_r_base.py +++ b/repo2docker/buildpacks/_r_base.py @@ -14,7 +14,7 @@ def rstudio_base_scripts(r_version): shiny_proxy_version = "1.1" shiny_sha256sum = "80f1e48f6c824be7ef9c843bb7911d4981ac7e8a963e0eff823936a8b28476ee" - if V(r_version) <= V("4.1"): + if r_version and V(r_version) <= V("4.1"): # Older RStudio and jupyter-rsession-proxy for v4.1 and below rstudio_url = "https://download2.rstudio.org/server/bionic/amd64/rstudio-server-1.3.959-amd64.deb" rstudio_sha256sum = ( diff --git a/tests/conda/r-unspecified/environment.yml b/tests/conda/r-unspecified/environment.yml new file mode 100644 index 00000000..246f3556 --- /dev/null +++ b/tests/conda/r-unspecified/environment.yml @@ -0,0 +1,3 @@ +dependencies: + - r-base + - r-ggplot2 diff --git a/tests/conda/r-unspecified/verify b/tests/conda/r-unspecified/verify new file mode 100755 index 00000000..9e45f377 --- /dev/null +++ b/tests/conda/r-unspecified/verify @@ -0,0 +1,7 @@ +#!/bin/sh + +jupyter serverextension list 2>&1 | grep jupyter_server_proxy +jupyter nbextension list 2>&1 | grep jupyter_server_proxy +R -e "library('ggplot2')" +# Fail if version is not at least 4.1 +R -e 'if (!(version$major == "4" && as.double(version$minor) >= 1)) quit("yes", 1)'