Repository navigation
[GRDM-63906] Upstreamの取り込み (2026.04.0) - #31
Merged
Merged
Conversation
for more information, see https://pre-commit.ci
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
Add --vanilla to R call
…po2docker Avoid jupyter-repo2docker in the commad line
…te-config [pre-commit.ci] pre-commit autoupdate
Simplify our release docs
Minor improvements to documentation
Released on 2024-10-31.
because the previous date was too old and didn't support the new version of R.
Add note on root users and make postbuild actions more discoverable
Change default R version from 4.2 to 4.4
Improve documentation index page
Replace --vanilla with --no-init-file
updates: - [github.com/psf/black-pre-commit-mirror: 26.1.0 → 26.3.1](psf/black-pre-commit-mirror@26.1.0...26.3.1)
freeze requirements in Dockerfile
…te-config [pre-commit.ci] pre-commit autoupdate
- exclude repo2docker itself from requirements.txt because dependabot messes with paths - group dependabot PRs - apply safer cooldown default
software is a valid category this is fragile and other categories can also fail
devtools::install_local has been deprecated
can't seem to _prevent_ writing cache
it leaves files in /tmp/ and ~/.cache/R/pkgcache/
pak doesn't work if caches are cleaned
R: use `remotes::local_install` instead of deprecated `devtools::install_local`
fix figshare url regex
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
and demote to debug
try to fix dependabot for Dockerfile
missing newline in dataverse log
(cherry picked from commit ad2bc89)
(cherry picked from commit 9396a48)
Collaborator
Author
yacchin1205
marked this pull request as ready for review
October 30, 2026 03:01
This was referenced Oct 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream
jupyterhub/repo2dockerの 2026.04.0 を取り込みます。repo2docker イメージのベースが Alpine 3.21 (Python 3.12) に更新されます。パッケージ定義の pyproject.toml への移行
upstream で
setup.pyが廃止されたため、CS-repo2docker で追加している依存 (osfclient(rdmclient),beautifulsoup4) をpyproject.tomlに移しました。また、repo2docker イメージは upstream で新設された
requirements.txt(固定済みの依存一覧) からビルドされるようになったため、これらの依存もrequirements.txtに追加しています。conflictの解決
repo2docker/buildpacks/_r_base.py: RStudio Serverの取得は CS-repo2docker の方式 (最新安定版の自動解決とrstudio.ymlによるバージョン指定) を維持し、upstream の固定URL方式は採用していません。jupyter-rsession-proxy(2.3.0) と Shiny Server の更新は upstream に合わせています。repo2docker/buildpacks/repo2docker-entrypoint: ログ書き込み時のエラー処理を upstream の実装 (ディスク容量不足時にログ出力を停止) に置き換えました。repo2docker/buildpacks/conda/environment.py-3.12*: CS-repo2docker で独自に追加していた Python 3.12 環境は upstream の定義に置き換えました。upstream のロックファイル更新により、ユーザー環境の既定の JupyterLab は 4.2 系から 4.4 系に上がります。rstudio.ymlのドキュメントは、upstream の Markdown 化に合わせてdocs/source/configuration/research.mdに移しました。ベースイメージの更新への対応
buildpack-deps:jammy(Ubuntu 22.04) からbuildpack-deps:24.04(Ubuntu 24.04) に変わります。ユーザー環境のOSも24.04となります。mpm.yml) のインストール処理をUbuntu 24.04に対応させ、ユニットテストを追加しました。upstreamの後続修正のcherry-pick
外部レコードの更新により失敗するようになったテストについて、upstream main の修正を取り込んでいます。
Fix dataverse test due to update in record by authorFix hydroshare test due to update in record by authorその他
certifiを更新しました。