Skip to content

Commit 5cfd798

Browse files
committed
handle r version unspecified in environment.yml
1 parent d8c1978 commit 5cfd798

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

repo2docker/buildpacks/_r_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def rstudio_base_scripts(r_version):
1414
shiny_proxy_version = "1.1"
1515
shiny_sha256sum = "80f1e48f6c824be7ef9c843bb7911d4981ac7e8a963e0eff823936a8b28476ee"
1616

17-
if V(r_version) <= V("4.1"):
17+
if r_version and V(r_version) <= V("4.1"):
1818
# Older RStudio and jupyter-rsession-proxy for v4.1 and below
1919
rstudio_url = "https://download2.rstudio.org/server/bionic/amd64/rstudio-server-1.3.959-amd64.deb"
2020
rstudio_sha256sum = (
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies:
2+
- r-base
3+
- r-ggplot2

tests/conda/r-unspecified/verify

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
jupyter serverextension list 2>&1 | grep jupyter_server_proxy
4+
jupyter nbextension list 2>&1 | grep jupyter_server_proxy
5+
R -e "library('ggplot2')"
6+
# Fail if version is not at least 4.1
7+
R -e 'if (!(version$major == "4" && as.double(version$minor) >= 1)) quit("yes", 1)'

0 commit comments

Comments
 (0)