Merge pull request #1165 from yuvipanda/bump

Bump default R version to 4.2 from 4.1, and let R 3.4 go from 3.4.0 to 3.4.4

Author: consideRatio

repo2docker/buildpacks/r.py

@@ -63,19 +63,25 @@ def r_version(self):
         Will return the version specified by the user or the current default
         version.
         """
+        # Available versions at https://cran.r-project.org/src/base/
         version_map = {
-            "4.2": "4.2.0",
+            "4.2": "4.2.1",
             "4.1": "4.1.3",
             "4.0": "4.0.5",
             "3.6": "3.6.3",
             "3.5": "3.5.3",
-            "3.4": "3.4.0",
+            "3.4": "3.4.4",
             "3.3": "3.3.3",
         }
 
         # the default if nothing is specified
         # Use full version is needed here, so it a valid semver
-        r_version = version_map["4.1"]
+        #
+        # NOTE: When updating this version, also update
+        #       - tests/unit/test_r.py -> test_version_specification
+        #       - tests/r/simple/verify
+        #
+        r_version = version_map["4.2"]
 
         if not hasattr(self, "_r_version"):
             parts = self.runtime.split("-")

tests/r/simple/verify

@@ -1,7 +1,7 @@
 #!/usr/bin/env Rscript
 library('testthat')
 
-# Fail if version is not 4.1
-if (!(version$major == "4" && as.double(version$minor) >= 1 && as.double(version$minor) < 2)) {
+# Fail if version is not 4.2
+if (!(version$major == "4" && as.double(version$minor) >= 2 && as.double(version$minor) < 3)) {
   quit("yes", 1)
 }

tests/unit/test_r.py

@@ -8,7 +8,7 @@
 
 
 @pytest.mark.parametrize(
-    "runtime_version, expected", [("", "4.1"), ("3.6", "3.6"), ("3.5.1", "3.5")]
+    "runtime_version, expected", [("", "4.2"), ("3.6", "3.6"), ("3.5.1", "3.5")]
 )
 def test_version_specification(tmpdir, runtime_version, expected):
     tmpdir.chdir()