Merge pull request #1401 from rgaiacs/1384-upgrade-r

Change default R version from 4.2 to 4.4

repo2docker/buildpacks/r.py

@@ -69,9 +69,9 @@ class RBuildPack(PythonBuildPack):
         """
         # Available versions at https://cran.r-project.org/src/base/
         version_map = {
-            "4.4": "4.4.1",
+            "4.4": "4.4.2",
             "4.3": "4.3.3",
-            "4.2": "4.2.1",
+            "4.2": "4.2.3",
             "4.1": "4.1.3",
             "4.0": "4.0.5",
             "3.6": "3.6.3",
@@ -87,7 +87,7 @@ class RBuildPack(PythonBuildPack):
         #       - tests/unit/test_r.py -> test_version_specification
         #       - tests/r/r-rspm-apt/verify
         #
-        r_version = version_map["4.2"]
+        r_version = version_map["4.4"]
 
         if not hasattr(self, "_r_version"):
             parts = self.runtime.split("-")

tests/r/r-rspm-apt-file/runtime.txt

@@ -1 +1 @@
-r-2022-06-23
+r-2025-07-01

tests/r/r-rspm-apt-file/verify.r

@@ -2,8 +2,8 @@
 library('digest')
 
 
-# Fail if version isn't 4.2, the default version for the RBuildPack
+# Fail if version isn't 4.4, the default version for the RBuildPack
 print(version)
-if (!(version$major == "4" && as.double(version$minor) >= 2 && as.double(version$minor) < 3)) {
+if (!(version$major == "4" && as.double(version$minor) >= 4 && as.double(version$minor) < 5)) {
   quit("yes", 1)
 }

tests/r/r-rspm-description-file/DESCRIPTION

@@ -1,6 +1,6 @@
 Package: binderdescription
 Version: 0.1
-Date: 2022-06-23
+Date: 2025-07-01
 Title: Binder R DESCRIPTION support
 Description: Test that automatically building R packages works
 Author: Bastian Greshake Tzovaras <bgreshake@googlemail.com>

tests/unit/test_r.py

@@ -8,7 +8,7 @@ from repo2docker import buildpacks
 
 
 @pytest.mark.parametrize(
-    "runtime_version, expected", [("", "4.2"), ("3.6", "3.6"), ("3.5.1", "3.5")]
+    "runtime_version, expected", [("", "4.4"), ("3.6", "3.6"), ("3.5.1", "3.5")]
 )
 def test_version_specification(tmpdir, runtime_version, expected, base_image):
     tmpdir.chdir()