Merge branch 'main' into python3.13

Author: mathbunnyru

.github/actions/create-dev-env/action.yml

@@ -14,3 +14,12 @@ runs:
         pip install --upgrade pip
         pip install --upgrade -r requirements-dev.txt
       shell: bash
+
+    # We need to have a recent docker version
+    # More info: https://github.com/jupyter/docker-stacks/pull/2255
+    # Can be removed after Docker Engine is updated
+    # https://github.com/actions/runner-images/issues/11766
+    - name: Set Up Docker 🐳
+      uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4.3.0
+      with:
+        set-host: true

.github/workflows/docker-build-test-upload.yml

@@ -1,4 +1,4 @@
-name: Download a parent image, build a new one, and test it; then upload the image, tags, and manifests to GitHub artifacts
+name: Download a parent image, build a new one, and test it; upload the image, tags, build history line and manifest to GitHub artifacts
 
 env:
   REGISTRY: quay.io
@@ -127,6 +127,7 @@ jobs:
           name: ${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}
           path: /tmp/jupyter/images/${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}.tar.zst
           retention-days: 3
+          compression-level: 0
 
       - name: Run tests ✅
         run: >

.github/workflows/docker-wiki-update.yml

@@ -1,4 +1,4 @@
-name: Download build manifests from GitHub artifacts and push them to GitHub wiki
+name: Download build history lines and manifests from GitHub artifacts and push them to the GitHub wiki
 # We're doing everything in one workflow on purpose
 # This way we make sure we don't access wiki pages from several jobs simultaneously
 

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Build, test, and push Docker Images
+name: Docker Stacks
 
 # [FAST_BUILD] in the PR title makes this workflow only build
 # the `jupyter/docker-stacks-foundation` and `jupyter/base-notebook` images

.github/workflows/sphinx.yml

@@ -7,19 +7,35 @@ on:
   pull_request:
     paths:
       - ".github/workflows/sphinx.yml"
+      - "Makefile"
 
       - "docs/**"
+
+      # Thse files are also rendered as docs pages
       - "README.md"
       - "CHANGELOG.md"
+
+      # These files are used to generate some code snippets in the docs
+      - "tagging/manifests/apt_packages.py"
+      - "tagging/manifests/manifest_interface.py"
+      - "tagging/taggers/sha.py"
+      - "tagging/taggers/tagger_interface.py"
   push:
     branches:
       - main
     paths:
       - ".github/workflows/sphinx.yml"
+      - "Makefile"
 
       - "docs/**"
+
       - "README.md"
       - "CHANGELOG.md"
+
+      - "tagging/manifests/apt_packages.py"
+      - "tagging/manifests/manifest_interface.py"
+      - "tagging/taggers/sha.py"
+      - "tagging/taggers/tagger_interface.py"
   workflow_dispatch:
 
 jobs:

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
 
   # Automatically sort python imports
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.0
+    rev: 6.0.1
     hooks:
       - id: isort
         args: [--profile, black]
@@ -35,7 +35,7 @@ repos:
 
   # Check python code static typing
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.15.0
     hooks:
       - id: mypy
         args: [--config, ./mypy.ini]
@@ -63,7 +63,7 @@ repos:
 
   # Autoformat: YAML, JSON, Markdown, etc.
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.2
+    rev: v3.5.3
     hooks:
       - id: prettier
 
@@ -72,6 +72,8 @@ repos:
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
       - id: end-of-file-fixer
       - id: requirements-txt-fixer
       - id: trailing-whitespace
@@ -100,7 +102,6 @@ repos:
     hooks:
       - id: yamllint
         args: ["-d {extends: relaxed, rules: {line-length: disable}}", "-s"]
-        files: \.(yaml|yml)$
 
   # Lint: Bash scripts
   - repo: https://github.com/openstack/bashate
@@ -118,7 +119,7 @@ repos:
 
   # Lint: Python
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.1.2
     hooks:
       - id: flake8
 

CHANGELOG.md

@@ -9,6 +9,35 @@ Affected: all images.
 
 - **Breaking:** `docker-stacks-foundation`: switch to Python 3.13 ([#2163](https://github.com/jupyter/docker-stacks/pull/2163)).
 
+## 2025-03-22
+
+Affected: all images.
+
+- **Non-breaking:** Use tty for running docker commands by default ([#2260](https://github.com/jupyter/docker-stacks/pull/2260)).
+- **Non-breaking:** Improve logs around running docker ([#2261](https://github.com/jupyter/docker-stacks/pull/2261)).
+
+## 2025-03-21
+
+Affected: all images.
+
+- **Non-breaking:** Refactor TrackedContainer run_detached/exec_cmd functions ([#2256](https://github.com/jupyter/docker-stacks/pull/2256)).
+- **Non-breaking:** Do not allocate TTY in tests if not needed ([#2257](https://github.com/jupyter/docker-stacks/pull/2257)).
+- **Non-breaking:** `base-notebook`: Flush output in Python before running execvp ([#2258](https://github.com/jupyter/docker-stacks/pull/2258)).
+
+## 2025-03-20
+
+Affected: all images except `docker-stacks-foundation`.
+
+- **Non-breaking:** `base-notebook`: Refactor healthcheck tests to use one function ([#2254](https://github.com/jupyter/docker-stacks/pull/2254)).
+- **Non-breaking:** `base-notebook`: Test server listening on IPv4/IPv6 ([#2255](https://github.com/jupyter/docker-stacks/pull/2255)).
+
+## 2025-03-12
+
+Affected: all images.
+
+- **Non-breaking:** Add `conda` and `mamba` version taggers ([#2251](https://github.com/jupyter/docker-stacks/pull/2251)).
+- **Non-breaking:** Make taggers and manifests functions ([#2252](https://github.com/jupyter/docker-stacks/pull/2252)).
+
 ## 2025-02-21
 
 Affected: all images.

Makefile

@@ -35,7 +35,7 @@ help:
 
 
 
-# Note that `ROOT_IMAGE` and `PYTHON_VERSION` arguments are only applicable to `docker-stacks-foundation` image
+# Note that `ROOT_IMAGE` and `PYTHON_VERSION` arguments are only applicable to the `docker-stacks-foundation` image
 build/%: DOCKER_BUILD_ARGS?=
 build/%: ROOT_IMAGE?=ubuntu:24.04
 build/%: PYTHON_VERSION?=3.13
@@ -54,7 +54,7 @@ build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
 
 
 check-outdated/%: ## check the outdated mamba/conda packages in a stack and produce a report
-	@TEST_IMAGE="$(REGISTRY)/$(OWNER)/$(notdir $@)" pytest tests/docker-stacks-foundation/test_outdated.py
+	@TEST_IMAGE="$(REGISTRY)/$(OWNER)/$(notdir $@)" pytest tests/by_image/docker-stacks-foundation/test_outdated.py
 check-outdated-all: $(foreach I, $(ALL_IMAGES), check-outdated/$(I)) ## check all the stacks for outdated packages
 
 
@@ -71,7 +71,7 @@ cont-clean-all: cont-stop-all cont-rm-all ## clean all containers (stop + rm)
 
 docs: ## build HTML documentation
 	sphinx-build -W --keep-going --color docs/ docs/_build/
-linkcheck-docs: ## check broken links
+linkcheck-docs: ## check for broken links
 	sphinx-build -W --keep-going --color -b linkcheck docs/ docs/_build/
 
 

README.md

@@ -1,6 +1,6 @@
 # Jupyter Docker Stacks
 
-[![GitHub actions badge](https://github.com/jupyter/docker-stacks/actions/workflows/docker.yml/badge.svg)](https://github.com/jupyter/docker-stacks/actions/workflows/docker.yml?query=branch%3Amain "Docker images build status")
+[![GitHub Actions badge](https://github.com/jupyter/docker-stacks/actions/workflows/docker.yml/badge.svg)](https://github.com/jupyter/docker-stacks/actions/workflows/docker.yml?query=branch%3Amain "Docker images build status")
 [![Read the Docs badge](https://img.shields.io/readthedocs/jupyter-docker-stacks.svg)](https://jupyter-docker-stacks.readthedocs.io/en/latest/ "Documentation build status")
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/jupyter/docker-stacks/main.svg)](https://results.pre-commit.ci/latest/github/jupyter/docker-stacks/main "pre-commit.ci build status")
 [![Discourse badge](https://img.shields.io/discourse/users.svg?color=%23f37626&server=https%3A%2F%2Fdiscourse.jupyter.org)](https://discourse.jupyter.org/ "Jupyter Discourse Forum")
@@ -29,11 +29,11 @@ Older images are available on Docker Hub, but they will no longer be updated.
 
 ### Example 1
 
-This command pulls the `jupyter/scipy-notebook` image tagged `2025-02-12` from Quay.io if it is not already present on the local host.
+This command pulls the `jupyter/scipy-notebook` image tagged `2025-03-14` from Quay.io if it is not already present on the local host.
 It then starts a container running a Jupyter Server with the JupyterLab frontend and exposes the container's internal port `8888` to port `10000` of the host machine:
 
 ```bash
-docker run -p 10000:8888 quay.io/jupyter/scipy-notebook:2025-02-12
+docker run -p 10000:8888 quay.io/jupyter/scipy-notebook:2025-03-14
 ```
 
 You can modify the port on which the container's port is exposed by [changing the value of the `-p` option](https://docs.docker.com/engine/containers/run/#exposed-ports) to `-p 8888:8888`.
@@ -48,11 +48,11 @@ The container remains intact for restart after the Server exits.
 
 ### Example 2
 
-This command pulls the `jupyter/datascience-notebook` image tagged `2025-02-12` from Quay.io if it is not already present on the local host.
+This command pulls the `jupyter/datascience-notebook` image tagged `2025-03-14` from Quay.io if it is not already present on the local host.
 It then starts an _ephemeral_ container running a Jupyter Server with the JupyterLab frontend and exposes the server on host port 10000.
 
 ```bash
-docker run -it --rm -p 10000:8888 -v "${PWD}":/home/jovyan/work quay.io/jupyter/datascience-notebook:2025-02-12
+docker run -it --rm -p 10000:8888 -v "${PWD}":/home/jovyan/work quay.io/jupyter/datascience-notebook:2025-03-14
 ```
 
 The use of the `-v` flag in the command mounts the current working directory on the host (`${PWD}` in the example command) as `/home/jovyan/work` in the container.
@@ -106,6 +106,8 @@ more information is available in the [documentation](https://jupyter-docker-stac
 
 ## Using old images
 
+[![Python versions badge](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg)](https://www.python.org/downloads/ "Python versions supported")
+
 This project only builds one set of images at a time.
 If you want to use the older `Ubuntu` and/or `Python` version, you can use the following images:
 

binder/Dockerfile

@@ -4,7 +4,7 @@
 # https://quay.io/repository/jupyter/base-notebook?tab=tags
 ARG REGISTRY=quay.io
 ARG OWNER=jupyter
-ARG BASE_IMAGE=$REGISTRY/$OWNER/base-notebook:2025-02-12
+ARG BASE_IMAGE=$REGISTRY/$OWNER/base-notebook:2025-03-14
 FROM $BASE_IMAGE
 
 LABEL maintainer="Jupyter Project <[email protected]>"
@@ -13,7 +13,7 @@ LABEL maintainer="Jupyter Project <[email protected]>"
 # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-ENV TAG="2025-02-12"
+ENV TAG="2025-03-14"
 
 COPY --chown=${NB_UID}:${NB_GID} binder/README.ipynb "${HOME}"/README.ipynb