Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upkeep for 2024 #494

Merged
merged 3 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/webr/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ URL: https://github.com/r-wasm/webr
BugReports: https://github.com/r-wasm/webr/issues
Imports:
utils
Config/usethis/last-upkeep: 2024-10-25
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
Expand Down
2 changes: 1 addition & 1 deletion packages/webr/LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2023
YEAR: 2024
COPYRIGHT HOLDER: webr authors
2 changes: 1 addition & 1 deletion packages/webr/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2023 webr authors
Copyright (c) 2024 webr authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 9 additions & 6 deletions packages/webr/R/install.R
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,15 @@ install <- function(packages,

if (mount) {
# Try mounting `.tgz` as v2.0 VFS image, fallback to extracting the .tgz
tryCatch({
install_vfs_image(repo, lib, pkg, pkg_ver)
next
}, error = function(cnd) {
warning(paste(cnd$message, "Falling back to traditional `.tgz` extraction."))
})
tryCatch(
{
install_vfs_image(repo, lib, pkg, pkg_ver)
next
},
error = function(cnd) {
warning(paste(cnd$message, "Falling back to traditional `.tgz` extraction."))
}
)
}

install_tgz(repo, lib, pkg, pkg_ver)
Expand Down
6 changes: 6 additions & 0 deletions packages/webr/R/webr-package.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#' @keywords internal
"_PACKAGE"

## usethis namespace: start
## usethis namespace: end
NULL
Loading