[GRDM-63906] Upstreamの取り込み (2026.04.0)

.github/dependabot.yaml

@@ -13,5 +13,26 @@ updates:
     labels: [ci]
     schedule:
       interval: monthly
-      time: "05:00"
-      timezone: Etc/UTC
+    cooldown:
+      default-days: 7
+    groups:
+      actions:
+        patterns:
+          - "*"
+
+  # Update frozen requirements in repo2docker Dockerfile
+  - package-ecosystem: pip
+    directory: /
+    allow:
+      # need this to upgrade requirements.txt
+      # otherwise only direct dependencies in requirements.in will be updated
+      - dependency-type: all
+    labels: [dependencies]
+    groups:
+      dockerfile:
+        patterns:
+          - "*"
+    schedule:
+      interval: monthly
+    cooldown:
+      default-days: 7

.github/workflows/docker.yml

@@ -32,13 +32,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       # https://github.com/docker/build-push-action
       - name: Build Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           tags: jupyter/repo2docker:pr

.github/workflows/release.yml

@@ -31,10 +31,10 @@ jobs:
   build-n-publish:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.9"
+          python-version: "3.13"
 
       - name: install build requirements
         run: |
@@ -47,7 +47,7 @@ jobs:
           ls -l dist
 
       # ref: https://github.com/actions/upload-artifact#readme
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: repo2docker-${{ github.sha }}
           path: "dist/*"
@@ -85,19 +85,19 @@ jobs:
           echo "REGISTRY=$REGISTRY" >> $GITHUB_ENV
           echo "Publishing to $REGISTRY"
 
-      # versioneer requires the full git history for non-tags
-      - uses: actions/checkout@v4
+      # git requires the full git history for non-tags
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       # Setup docker to build for multiple platforms, see:
       # https://github.com/docker/build-push-action/tree/v2.4.0#usage
       # https://github.com/docker/build-push-action/blob/v2.4.0/docs/advanced/multi-platform.md
       - name: Set up QEMU (for docker buildx)
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx (for multi-arch builds)
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           # Allows pushing to registry on localhost:5000
           driver-opts: network=host
@@ -111,7 +111,8 @@ jobs:
       # also push jupyter/repo2docker:1.2.3-3.abcd1234 (replace + with -)
       - name: Get list of repo2docker docker tags
         run: |
-          VERSION=$(python3 -c 'import versioneer; print(versioneer.get_version().replace("+", "-"))')
+          pip install setuptools-scm
+          VERSION=$(python3 -m setuptools_scm | sed s@+@-@g)
           TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$VERSION"
           if [ "${{ github.ref }}" == "refs/heads/main" ]; then
             TAGS="$TAGS,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main"
@@ -124,7 +125,7 @@ jobs:
           echo "TAGS=$TAGS" >> $GITHUB_ENV
 
       - name: Build and push repo2docker
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/test.yml

@@ -40,15 +40,21 @@ env:
   GIT_AUTHOR_EMAIL: ci-user@github.local
   GIT_AUTHOR_NAME: CI User
 
+
 jobs:
   test:
+    # Don't run scheduled tests on forks
+    if: ${{ github.repository_owner == 'jupyterhub' || github.event_name != 'schedule' }}
+
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
 
     strategy:
       fail-fast: false
       matrix:
         ubuntu_version: ["24.04"]
-        python_version: ["3.10"]
+        python_version: ["3.13"]
+        container_cli:
+          - docker
         repo_type:
           - base
           - conda
@@ -60,10 +66,43 @@ jobs:
           - r
           - unit
           - venv
+          - contentproviders
+          - norun
+          # Playwright test
+          - ui
+        # If the item to be include would overwrite a value,
+        # it must have all the fields!
+        include:
+          # The earliest actions/setup-python versions depend on the runner.
+          - ubuntu_version: "24.04"
+            python_version: "3.10"
+            container_cli: docker
+            repo_type: venv
+          # Run all tests for both Docker and Podman is expensive.
+          # We only run the "smoke" test for Podman.
+          - ubuntu_version: "24.04"
+            python_version: "3.13"
+            container_cli: podman
+            repo_type: base
+          # We are observing "no space left on device" on GitHub Actions,
+          # https://github.com/jupyterhub/repo2docker/pull/1471#issuecomment-3744990787
+          # - ubuntu_version: "24.04"
+          #   python_version: "3.13"
+          #   container_cli: podman
+          #   repo_type: conda
+          - ubuntu_version: "24.04"
+            python_version: "3.13"
+            container_cli: podman
+            repo_type: dockerfile
+          - ubuntu_version: "24.04"
+            python_version: "3.13"
+            container_cli: podman
+            repo_type: unit
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-python@v6
         with:
           python-version: "${{ matrix.python_version }}"
 
@@ -72,6 +111,12 @@ jobs:
           pip install -r dev-requirements.txt
           pip freeze
 
+      - name: Install UI test dependencies
+        if: matrix.repo_type == 'ui'
+        run: |
+          pip install -r playwright-requirements.txt
+          playwright install firefox
+
       - name: Install repo2docker
         run: |
           python -m build --wheel .
@@ -84,6 +129,11 @@ jobs:
 
       - name: Run pytest
         run: |
+          if [ "${{ matrix.container_cli }}" = "podman" ]
+          then
+          systemctl --user start podman.socket
+          export DOCKER_HOST=unix://$(podman info --format '{{.Host.RemoteSocket.Path}}')
+          fi
           pytest --verbose --color=yes --durations=10 --cov=repo2docker tests/${{ matrix.repo_type }}
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v6

.gitignore

@@ -192,3 +192,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+# generated by setuptools_scm
+repo2docker/_version.py

.pre-commit-config.yaml

@@ -11,40 +11,29 @@
 repos:
   # Autoformat: Python code, syntax patterns are modernized
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
-        args:
-          - --py36-plus
         # check-tmp is a Python based test script run in created environments
-        # that can be at least Python 3.5 even though we require Python 3.6 for
-        # repo2docker itself.
+        # that can be Python 3.5, older than the Python version required to run
+        # repo2docker.
         exclude: check-tmp
 
   # Autoformat: Python code
-  - repo: https://github.com/psf/black
-    rev: 24.10.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 26.3.1
     hooks:
       - id: black
-        args:
-          - --target-version=py36
-          - --target-version=py37
-          - --target-version=py38
-          - --target-version=py39
-          - --target-version=py310
-          - --target-version=py311
 
   # Autoformat: Python code
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 8.0.1
     hooks:
       - id: isort
-        args:
-          - --profile=black
 
   # Autoformat: markdown
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.8.1
     hooks:
       - id: prettier
         files: ".md"

.readthedocs.yaml

@@ -6,11 +6,12 @@ version: 2
 
 sphinx:
   configuration: docs/source/conf.py
+  builder: dirhtml
 
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.10"
+    python: "3.11"
 
 python:
   install:

CONTRIBUTING.md

@@ -5,23 +5,23 @@
 (And thank you particularly for coming to read the guidelines! :heart_eyes:)
 
 The repo2docker developer documentation is all rendered on our documentation website: [https://repo2docker.readthedocs.io](https://repo2docker.readthedocs.io).
-If you're here, you're probably looking for the [Contributing to repo2docker development](https://repo2docker.readthedocs.io/en/latest/contributing/contributing.html) page.
+If you're here, you're probably looking for the [Contributing to repo2docker development](https://repo2docker.readthedocs.io/en/latest/contribute/contributing.html) page.
 
 Please make sure you've read the following sections before opening an issue/pull request:
 
-- [Process for making a contribution](https://repo2docker.readthedocs.io/en/latest/contributing/contributing.html#process-for-making-a-contribution).
+- [Process for making a contribution](https://repo2docker.readthedocs.io/en/latest/contribute/contributing.html#process-for-making-a-contribution).
   - These steps talk you through choosing the right issue template (bug report or feature request) and making a change.
-- [Guidelines to getting a Pull Request merged](https://repo2docker.readthedocs.io/en/latest/contributing/contributing.html#guidelines-to-getting-a-pull-request-merged).
+- [Guidelines to getting a Pull Request merged](https://repo2docker.readthedocs.io/en/latest/contribute/contributing.html#guidelines-to-getting-a-pull-request-merged).
   - These are tips and tricks to help make your contribution as smooth as possible for you and for the repo2docker maintenance team.
 
 There are a few other pages to highlight:
 
-- [Our roadmap](https://repo2docker.readthedocs.io/en/latest/contributing/roadmap.html)
+- [Our roadmap](https://repo2docker.readthedocs.io/en/latest/contribute/roadmap.html)
   - We use the roadmap to develop a shared understanding of the project's vision and direction amongst the community of users, contributors, and maintainers.
     This is a great place to get a feel for what the maintainers are thinking about for the short, medium, and long term future of the project.
 - [Design of repo2docker](https://repo2docker.readthedocs.io/en/latest/design.html)
   - This page explains some of the design principles behind repo2docker.
     Its a good place to understand _why_ the team have made the decisions that they have along the way!
   - We absolutely encourage discussion around refactoring, updating or extending repo2docker, but please make sure that you've understood this page before opening an issue to discuss the change you'd like to propose.
-- [Common developer tasks and how-tos](https://repo2docker.readthedocs.io/en/latest/contributing/tasks.html)
+- [Common developer tasks and how-tos](https://repo2docker.readthedocs.io/en/latest/contribute/tasks.html)
   - Some notes on running tests, buildpack dependencies, creating a release, and keeping the pip files up to date.

Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.3
-ARG ALPINE_VERSION=3.19
+ARG ALPINE_VERSION=3.21
 FROM alpine:${ALPINE_VERSION}
 
 RUN apk add --no-cache git python3 python3-dev py3-pip py3-setuptools build-base
@@ -15,7 +15,7 @@ RUN cd /tmp/src && git clean -xfd && git status
 RUN mkdir /tmp/wheelhouse \
  && cd /tmp/wheelhouse \
  && pip install wheel \
- && pip wheel --no-cache-dir /tmp/src \
+ && pip wheel --no-cache-dir -r /tmp/src/requirements.txt /tmp/src \
  && ls -l /tmp/wheelhouse
 
 FROM alpine:${ALPINE_VERSION}

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/jupyterhub/repo2docker/workflows/Test/badge.svg)](https://github.com/jupyterhub/repo2docker/actions)
 [![Documentation Status](https://readthedocs.org/projects/repo2docker/badge/?version=latest)](http://repo2docker.readthedocs.io/en/latest/?badge=latest)
-[![Contribute](https://img.shields.io/badge/I_want_to_contribute!-grey?logo=jupyter)](https://repo2docker.readthedocs.io/en/latest/contributing/contributing.html)
+[![Contribute](https://img.shields.io/badge/I_want_to_contribute!-grey?logo=jupyter)](https://repo2docker.readthedocs.io/en/latest/contribute/)
 [![Docker Repository on Quay](https://img.shields.io/badge/quay.io-container-green "Docker Repository on Quay")](https://quay.io/repository/jupyterhub/repo2docker?tab=tags)
 
 `repo2docker` fetches a git repository and builds a container image based on
@@ -36,13 +36,13 @@ For more information, please visit
 
 1. Docker to build & run the repositories. The [community edition](https://store.docker.com/search?type=edition&offering=community)
    is recommended.
-2. Python 3.6+.
+2. Python 3.9+.
 
-Supported on Linux and macOS. [See documentation note about Windows support.](http://repo2docker.readthedocs.io/en/latest/install.html#note-about-windows-support)
+Supported on Linux and macOS. [See documentation note about Windows support.](https://nickjanetakis.com/blog/setting-up-docker-for-windows-and-wsl-to-work-flawlessly)
 
 ### Installation
 
-This a quick guide to installing `repo2docker`, see our documentation for [a full guide](https://repo2docker.readthedocs.io/en/latest/install.html).
+This a quick guide to installing `repo2docker`, see our documentation for [a full guide](https://repo2docker.readthedocs.io/en/latest/start/#install-repo2docker).
 
 To install from PyPI:
 
@@ -85,14 +85,14 @@ If you copy paste that URL into your browser you will see a Jupyter Notebook
 with the contents of the repository you had just built!
 
 For more information on how to use `repo2docker`, see the
-[usage guide](http://repo2docker.readthedocs.io/en/latest/usage.html).
+[user guide](https://repo2docker.readthedocs.io/en/latest/use/).
 
 ## Repository specifications
 
 Repo2Docker looks for configuration files in the source repository to
 determine how the Docker image should be built. For a list of the configuration
 files that `repo2docker` can use, see the
-[complete list of configuration files](https://repo2docker.readthedocs.io/en/latest/config_files.html).
+[complete list of configuration files](https://repo2docker.readthedocs.io/en/latest/configuration/).
 
 The philosophy of repo2docker is inspired by
 [Heroku Build Packs](https://devcenter.heroku.com/articles/buildpacks).

RELEASE.md

@@ -1 +1 @@
-See https://repo2docker.readthedocs.io/en/latest/contributing/tasks.html#creating-a-release
+See https://repo2docker.readthedocs.io/en/latest/contribute/tasks/#creating-a-release

dev-requirements.txt

@@ -6,3 +6,4 @@ pytest-cov
 pytest>=7
 pyyaml
 requests_mock
+bcrypt