Merge branch 'main' into python3.13

Author: mathbunnyru

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

@@ -81,7 +81,7 @@ jobs:
           python3 -m tagging.apps.write_tags_file
           --registry ${{ env.REGISTRY }}
           --owner ${{ env.OWNER }}
-          --short-image-name ${{ inputs.image }}
+          --image ${{ inputs.image }}
           --variant ${{ inputs.variant }}
           --tags-dir /tmp/jupyter/tags/
         shell: bash
@@ -97,7 +97,7 @@ jobs:
           python3 -m tagging.apps.write_manifest
           --registry ${{ env.REGISTRY }}
           --owner ${{ env.OWNER }}
-          --short-image-name ${{ inputs.image }}
+          --image ${{ inputs.image }}
           --variant ${{ inputs.variant }}
           --hist-lines-dir /tmp/jupyter/hist_lines/
           --manifests-dir /tmp/jupyter/manifests/
@@ -133,5 +133,5 @@ jobs:
           python3 -m tests.run_tests
           --registry ${{ env.REGISTRY }}
           --owner ${{ env.OWNER }}
-          --short-image-name ${{ inputs.image }}
+          --image ${{ inputs.image }}
         shell: bash

.github/workflows/docker-merge-tags.yml

@@ -69,7 +69,7 @@ jobs:
         if: env.PUSH_TO_REGISTRY == 'true'
         run: >
           python3 -m tagging.apps.merge_tags
-          --short-image-name ${{ inputs.image }}
+          --image ${{ inputs.image }}
           --variant ${{ inputs.variant }}
           --tags-dir /tmp/jupyter/tags/
         shell: bash

.github/workflows/docker-tag-push.yml

@@ -65,7 +65,7 @@ jobs:
           python3 -m tagging.apps.apply_tags
           --registry ${{ env.REGISTRY }}
           --owner ${{ env.OWNER }}
-          --short-image-name ${{ inputs.image }}
+          --image ${{ inputs.image }}
           --variant ${{ inputs.variant }}
           --platform ${{ inputs.platform }}
           --tags-dir /tmp/jupyter/tags/

.github/workflows/docker.yml

@@ -523,8 +523,6 @@ jobs:
     uses: ./.github/workflows/docker-wiki-update.yml
     needs: [aarch64-images-tag-push-fast, x86_64-images-tag-push-fast]
     if: contains(github.event.pull_request.title, '[FAST_BUILD]')
-    permissions:
-      contents: write
 
   contributed-recipes:
     uses: ./.github/workflows/contributed-recipes.yml

.github/workflows/pre-commit.yml

@@ -7,9 +7,6 @@ on:
       - main
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   run-hooks:
     runs-on: ubuntu-24.04

.github/workflows/sphinx.yml

@@ -25,10 +25,8 @@ on:
 jobs:
   build-docs:
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
+    timeout-minutes: 10
     if: github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru' || github.event_name != 'schedule'
-    permissions:
-      contents: write
 
     steps:
       - name: Checkout Repo ⚡️

Makefile

@@ -41,7 +41,7 @@ build/%: ROOT_IMAGE?=ubuntu:24.04
 build/%: PYTHON_VERSION?=3.13
 build/%: ## build the latest image for a stack using the system's architecture
 	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm \
-	  --tag "$(REGISTRY)/$(OWNER)/$(notdir $@):latest" \
+	  --tag "$(REGISTRY)/$(OWNER)/$(notdir $@)" \
 	  "./images/$(notdir $@)" \
 	  --build-arg REGISTRY="$(REGISTRY)" \
 	  --build-arg OWNER="$(OWNER)" \
@@ -82,21 +82,21 @@ hook/%: ## run post-build hooks for an image
 	python3 -m tagging.apps.write_tags_file \
 	  --registry "$(REGISTRY)" \
 	  --owner "$(OWNER)" \
-	  --short-image-name "$(notdir $@)" \
+	  --image "$(notdir $@)" \
 	  --variant "$(VARIANT)" \
 	  --tags-dir /tmp/jupyter/tags/
 	python3 -m tagging.apps.write_manifest \
 	  --registry "$(REGISTRY)" \
 	  --owner "$(OWNER)" \
-	  --short-image-name "$(notdir $@)" \
+	  --image "$(notdir $@)" \
 	  --variant "$(VARIANT)" \
 	  --hist-lines-dir /tmp/jupyter/hist_lines/ \
 	  --manifests-dir /tmp/jupyter/manifests/ \
 	  --repository "$(REPOSITORY)"
 	python3 -m tagging.apps.apply_tags \
 	  --registry "$(REGISTRY)" \
 	  --owner "$(OWNER)" \
-	  --short-image-name "$(notdir $@)" \
+	  --image "$(notdir $@)" \
 	  --variant "$(VARIANT)" \
 	  --platform "$(shell uname -m)" \
 	  --tags-dir /tmp/jupyter/tags/
@@ -139,5 +139,5 @@ test/%: ## run tests against a stack
 	python3 -m tests.run_tests \
 	  --registry "$(REGISTRY)" \
 	  --owner "$(OWNER)" \
-	  --short-image-name "$(notdir $@)"
+	  --image "$(notdir $@)"
 test-all: $(foreach I, $(ALL_IMAGES), test/$(I)) ## test all stacks

docs/contributing/tests.md

@@ -4,17 +4,17 @@ We greatly appreciate Pull Requests that extend the automated tests that vet the
 
 ## How the Tests Work
 
-A [GitHub Action workflow](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker.yml)
+A [GitHub Action workflow](https://github.com/jupyter/docker-stacks/blob/main/.github/workflows/docker-build-test-upload.yml)
 runs tests against pull requests submitted to the `jupyter/docker-stacks` repository.
 
 We use the `pytest` module to run tests on the image.
 `conftest.py` and `pytest.ini` in the `tests` folder define the environment in which tests are run.
 More info on `pytest` can be found [here](https://docs.pytest.org/en/latest/contents.html).
 
-The actual image-specific test files are located in folders like `tests/<somestack>/` (e.g., `tests/docker-stacks-foundation/`, `tests/minimal-notebook/`, etc.).
+The actual image-specific test files are located in folders like `tests/by_image/<somestack>/` (e.g., `tests/by_image/docker-stacks-foundation/`, etc.).
 
 ```{note}
-If your test is located in `tests/<somestack>/`, it will be run against the `jupyter/<somestack>` image and against all the [images inherited from this image](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html#image-relationships.
+If your test is located in `tests/by_image/<somestack>/`, it will be run against the `jupyter/<somestack>` image and against all the [images inherited from this image](../using/selecting.md#image-relationships).
 ```
 
 Many tests make use of global [pytest fixtures](https://docs.pytest.org/en/latest/reference/fixtures.html)
@@ -23,15 +23,15 @@ defined in the [conftest.py](https://github.com/jupyter/docker-stacks/blob/main/
 ## Unit tests
 
 You can add a unit test if you want to run a Python script in one of our images.
-You should create a `tests/<somestack>/units/` directory, if it doesn't already exist, and put your file there.
+You should create a `tests/by_image/<somestack>/units/` directory, if it doesn't already exist, and put your file there.
 Files in this folder will be executed in the container when tests are run.
-You can see an [TensorFlow package example here](https://github.com/jupyter/docker-stacks/blob/HEAD/tests/tensorflow-notebook/units/unit_tensorflow.py).
+You can see an [TensorFlow package example here](https://github.com/jupyter/docker-stacks/blob/HEAD/tests/by_image/tensorflow-notebook/units/unit_tensorflow.py).
 
 ## Contributing New Tests
 
 Please follow the process below to add new tests:
 
-1. Add your test code to one of the modules in the `tests/<somestack>/` directory or create a new module.
+1. Add your test code to one of the modules in the `tests/by_image/<somestack>/` directory or create a new module.
 2. Build one or more images you intend to test and run the tests locally.
    If you use `make`, call:
 

docs/maintaining/tagging.md

@@ -69,18 +69,14 @@ So, the `tag_value(container)` method gets a docker container as an input and re
 
 ### Manifest
 
-`ManifestHeader` is a build manifest header.
-It contains the following sections: `Build timestamp`, `Docker image size`, and `Git commit` info.
-
-All the other manifest classes are inherited from `ManifestInterface`:
+All manifest classes except `BuildInfo` are inherited from `ManifestInterface`
+and `markdown_piece(container)` method returns a piece of the build manifest.
 
 ```{literalinclude} ../../tagging/manifests/manifest_interface.py
 :language: py
 :start-at: class ManifestInterface
 ```
 
-- The `markdown_piece(container)` method returns a piece of markdown file to be used as a part of the build manifest.
-
 `AptPackagesManifest` example:
 
 ```{literalinclude} ../../tagging/manifests/apt_packages.py

docs/using/custom-images.md

@@ -4,7 +4,7 @@ This section describes how to build a custom set of images.
 It may be helpful if you need to change the Ubuntu or Python version, or to make a significant change to the build process itself.
 
 This project only builds one set of images at a time.
-If you want to use older images, take a look [here](https://jupyter-docker-stacks.readthedocs.io/en/latest/#using-old-images).
+If you want to use older images, take a look [here](../index.rst/#using-old-images).
 
 ## Automating your build using template cookiecutter project