From 5de06564b556e6765d19d22c5cd2616b6be6f657 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Mar 2026 11:16:47 +0800 Subject: [PATCH 1/3] Bug fix on unloading loaded packages --- R/unload.r | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/R/unload.r b/R/unload.r index cdf63f4b..b225ac6d 100644 --- a/R/unload.r +++ b/R/unload.r @@ -153,10 +153,18 @@ purge_cache = function () { #' @keywords internal unload_mod = function (mod_ns, info) { + UseMethod('unload_mod', info) +} + +`unload_mod.box$mod_info` = function (mod_ns, info) { call_hook(mod_ns, '.on_unload', mod_ns) deregister_mod(info) } +`unload_mod.box$pkg_info` = function (mod_ns, info) { + invisible(NULL) +} + #' @keywords internal unload_mod_recursive = function (mod_ns, info) { UseMethod('unload_mod_recursive') From 4724adcaea25d04f3e46ab1fead80b7491d09430 Mon Sep 17 00:00:00 2001 From: Konrad Rudolph Date: Mon, 4 May 2026 14:21:26 +0200 Subject: [PATCH 2/3] Remove Bashism that breaks GHA worflow --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7a952a76..a5cfacd5 100644 --- a/Makefile +++ b/Makefile @@ -130,10 +130,10 @@ build-cran: favicons: ${favicons} export-favicon = \ - @sz=$$(sed 's/.*x\([[:digit:]]*\)\.png/\1/' <<<"$@") \ - && set -x; \ + @sz=$$(echo "$@" | sed 's/.*x\([[:digit:]]*\)\.png/\1/'); \ inkscape -w $$sz -h $$sz --export-area $1 --export-filename=${@D}/tmp-${@F} $< \ - && pngcrush -q ${@D}/tmp-${@F} $@ && rm ${@D}/tmp-${@F} + && pngcrush -q ${@D}/tmp-${@F} $@ \ + && ${RM} ${@D}/tmp-${@F} ${favicons_small}: figures/logo.svg | pkgdown/favicon $(call export-favicon,-11:1000:181:1192) From b25a3f95872faa6c246a91b0d8c25fff8df1cb28 Mon Sep 17 00:00:00 2001 From: Konrad Rudolph Date: Mon, 4 May 2026 16:45:56 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Remove=20benchmark=20from=20=E2=80=98pkgdow?= =?UTF-8?q?n=E2=80=99=20documentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgdown/_pkgdown.yml | 2 -- vignettes/{extract-benchmark.rmd => extract-benchmark.rmd.skip} | 0 2 files changed, 2 deletions(-) rename vignettes/{extract-benchmark.rmd => extract-benchmark.rmd.skip} (100%) diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml index eeee5353..dd170713 100644 --- a/pkgdown/_pkgdown.yml +++ b/pkgdown/_pkgdown.yml @@ -49,8 +49,6 @@ navbar: href: articles/contributing.html - text: Module environments href: articles/mod-envs.html - - text: Module access benchmark - href: articles/extract-benchmark.html template: bootstrap: 5 diff --git a/vignettes/extract-benchmark.rmd b/vignettes/extract-benchmark.rmd.skip similarity index 100% rename from vignettes/extract-benchmark.rmd rename to vignettes/extract-benchmark.rmd.skip