diff --git a/repo2docker/buildpacks/r.py b/repo2docker/buildpacks/r.py index 0c5c6c439..35703162e 100644 --- a/repo2docker/buildpacks/r.py +++ b/repo2docker/buildpacks/r.py @@ -69,9 +69,9 @@ def r_version(self): """ # 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 @@ def r_version(self): # - 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("-") diff --git a/tests/r/r-rspm-apt-file/runtime.txt b/tests/r/r-rspm-apt-file/runtime.txt index aa35fc0b3..fac25eae6 100644 --- a/tests/r/r-rspm-apt-file/runtime.txt +++ b/tests/r/r-rspm-apt-file/runtime.txt @@ -1 +1 @@ -r-2022-06-23 +r-2025-07-01 diff --git a/tests/r/r-rspm-apt-file/verify.r b/tests/r/r-rspm-apt-file/verify.r index 30117134a..ca5b27d14 100755 --- a/tests/r/r-rspm-apt-file/verify.r +++ b/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) } diff --git a/tests/r/r-rspm-description-file/DESCRIPTION b/tests/r/r-rspm-description-file/DESCRIPTION index 2c51fc3c7..a63e8d622 100644 --- a/tests/r/r-rspm-description-file/DESCRIPTION +++ b/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 diff --git a/tests/unit/test_r.py b/tests/unit/test_r.py index a7028d829..24c486093 100644 --- a/tests/unit/test_r.py +++ b/tests/unit/test_r.py @@ -8,7 +8,7 @@ @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()