From 13134ce88de1393bde819151d37d01cee17217a3 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 25 Aug 2025 10:46:04 -0700 Subject: [PATCH 1/3] add support for R 4.5.1 --- repo2docker/buildpacks/r.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repo2docker/buildpacks/r.py b/repo2docker/buildpacks/r.py index 9a81f046..094c0ae1 100644 --- a/repo2docker/buildpacks/r.py +++ b/repo2docker/buildpacks/r.py @@ -69,6 +69,7 @@ class RBuildPack(PythonBuildPack): """ # Available versions at https://cran.r-project.org/src/base/ version_map = { + "4.5": "4.5.1", "4.4": "4.4.2", "4.3": "4.3.3", "4.2": "4.2.3", From e58829348d6ec1a2962f0aaac2b3ce1a95dc5063 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 26 Aug 2025 11:37:08 -0700 Subject: [PATCH 2/3] porting tests to r4.5.1 --- tests/r/r4.4-rspm/runtime.txt | 1 - tests/r/{r4.4-rspm => r4.5-rspm}/install.R | 0 tests/r/r4.5-rspm/runtime.txt | 1 + tests/r/{r4.4-rspm => r4.5-rspm}/verify | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 tests/r/r4.4-rspm/runtime.txt rename tests/r/{r4.4-rspm => r4.5-rspm}/install.R (100%) create mode 100644 tests/r/r4.5-rspm/runtime.txt rename tests/r/{r4.4-rspm => r4.5-rspm}/verify (65%) diff --git a/tests/r/r4.4-rspm/runtime.txt b/tests/r/r4.4-rspm/runtime.txt deleted file mode 100644 index 1375871d..00000000 --- a/tests/r/r4.4-rspm/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -r-4.4-2025-01-01 diff --git a/tests/r/r4.4-rspm/install.R b/tests/r/r4.5-rspm/install.R similarity index 100% rename from tests/r/r4.4-rspm/install.R rename to tests/r/r4.5-rspm/install.R diff --git a/tests/r/r4.5-rspm/runtime.txt b/tests/r/r4.5-rspm/runtime.txt new file mode 100644 index 00000000..83911bf8 --- /dev/null +++ b/tests/r/r4.5-rspm/runtime.txt @@ -0,0 +1 @@ +r-4.5.1-2025-05-13 diff --git a/tests/r/r4.4-rspm/verify b/tests/r/r4.5-rspm/verify similarity index 65% rename from tests/r/r4.4-rspm/verify rename to tests/r/r4.5-rspm/verify index 0e02bdd4..6d913061 100755 --- a/tests/r/r4.4-rspm/verify +++ b/tests/r/r4.5-rspm/verify @@ -1,9 +1,9 @@ #!/usr/bin/env Rscript library('digest') -# Fail if version is not 4.0 +# Fail if version is not 4.5 print(version) -if (!(version$major == "4" && as.double(version$minor) >= 4 && as.double(version$minor) < 5)) { +if (!(version$major == "4" && as.double(version$minor) >= 5 && as.double(version$minor) < 6)) { quit("yes", 1) } From 541229b01021c5c8e32e31a56ca9a8cf5dfdf852 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 26 Aug 2025 11:40:48 -0700 Subject: [PATCH 3/3] fat-fingered month from the cran repo: https://cran.r-project.org/src/base/R-4/ --- tests/r/r4.5-rspm/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/r/r4.5-rspm/runtime.txt b/tests/r/r4.5-rspm/runtime.txt index 83911bf8..a5718197 100644 --- a/tests/r/r4.5-rspm/runtime.txt +++ b/tests/r/r4.5-rspm/runtime.txt @@ -1 +1 @@ -r-4.5.1-2025-05-13 +r-4.5.1-2025-06-13