Skip to content

Commit 4352535

Browse files
authored
Merge pull request #1107 from yuvipanda/new-r
Bump default R version to 4.1
2 parents 457f718 + e2aefcf commit 4352535

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

repo2docker/buildpacks/r.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def r_version(self):
8181
"4.1": "4.1.2-1.1804.0",
8282
}
8383
# the default if nothing is specified
84-
r_version = "3.6"
84+
r_version = "4.1"
8585

8686
if not hasattr(self, "_r_version"):
8787
parts = self.runtime.split("-")

tests/r/simple/verify

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
#!/usr/bin/env Rscript
22
library('ggplot2')
3+
4+
# Fail if version is not 4.1
5+
if (!(version$major == "4" && as.double(version$minor) >= 1 && as.double(version$minor) < 2)) {
6+
quit("yes", 1)
7+
}

tests/unit/test_r.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_unsupported_version(tmpdir):
2222

2323

2424
@pytest.mark.parametrize(
25-
"runtime_version, expected", [("", "3.6"), ("3.6", "3.6"), ("3.5.1", "3.5")]
25+
"runtime_version, expected", [("", "4.1"), ("3.6", "3.6"), ("3.5.1", "3.5")]
2626
)
2727
def test_version_specification(tmpdir, runtime_version, expected):
2828
tmpdir.chdir()

0 commit comments

Comments
 (0)