Merge branch 'main' into python3.13

Author: mathbunnyru

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

@@ -101,6 +101,7 @@ jobs:
           --variant ${{ inputs.variant }}
           --hist-lines-dir /tmp/jupyter/hist_lines/
           --manifests-dir /tmp/jupyter/manifests/
+          --repository ${{ github.repository }}
         shell: bash
       - name: Upload manifest file 💾
         uses: actions/upload-artifact@v4

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

@@ -53,4 +53,4 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
         with:
           commit_message: "Automated wiki publish for ${{ github.sha }}"
-          repository: wiki/
+          repository: wiki_src/

.github/workflows/docker.yml

@@ -436,7 +436,10 @@ jobs:
         x86_64-r,
         x86_64-julia,
         x86_64-tensorflow,
+        x86_64-tensorflow-cuda,
         x86_64-pytorch,
+        x86_64-pytorch-cuda11,
+        x86_64-pytorch-cuda12,
         x86_64-datascience,
         x86_64-pyspark,
         x86_64-all-spark,

CHANGELOG.md

@@ -13,7 +13,8 @@ Affected: all images.
 
 Affected: all images.
 
-- **Non-breaking:**: Better tagging directory structure ([#2228](https://github.com/jupyter/docker-stacks/pull/2228)).
+- **Non-breaking:** Better tagging directory structure ([#2228](https://github.com/jupyter/docker-stacks/pull/2228)).
+- **Non-breaking:** Better testing directory structure ([#2231](https://github.com/jupyter/docker-stacks/pull/2231)).
 
 ## 2025-02-18
 

Makefile

@@ -77,6 +77,7 @@ linkcheck-docs: ## check broken links
 
 
 hook/%: VARIANT?=default
+hook/%: REPOSITORY?=$(OWNER)/docker-stacks
 hook/%: ## run post-build hooks for an image
 	python3 -m tagging.apps.write_tags_file \
 	  --registry "$(REGISTRY)" \
@@ -90,7 +91,8 @@ hook/%: ## run post-build hooks for an image
 	  --short-image-name "$(notdir $@)" \
 	  --variant "$(VARIANT)" \
 	  --hist-lines-dir /tmp/jupyter/hist_lines/ \
-	  --manifests-dir /tmp/jupyter/manifests/
+	  --manifests-dir /tmp/jupyter/manifests/ \
+	  --repository "$(REPOSITORY)"
 	python3 -m tagging.apps.apply_tags \
 	  --registry "$(REGISTRY)" \
 	  --owner "$(OWNER)" \

docs/maintaining/tagging.md

@@ -28,6 +28,7 @@ For example, we dump all `conda` packages with their versions into the manifest.
 
 ```{literalinclude} tagging_examples/docker_runner.py
 :language: py
+:lines: 3-
 ```
 
 ### GitHelper
@@ -36,6 +37,7 @@ For example, we dump all `conda` packages with their versions into the manifest.
 
 ```{literalinclude} tagging_examples/git_helper.py
 :language: py
+:lines: 3-
 ```
 
 The prefix of commit hash (namely, 12 letters) is used as an image tag to make it easy to inherit from a fixed version of a docker image.
@@ -50,6 +52,7 @@ All the taggers are inherited from `TaggerInterface`:
 
 ```{literalinclude} ../../tagging/taggers/tagger_interface.py
 :language: py
+:start-at: class TaggerInterface
 ```
 
 So, the `tag_value(container)` method gets a docker container as an input and returns a tag.
@@ -58,6 +61,7 @@ So, the `tag_value(container)` method gets a docker container as an input and re
 
 ```{literalinclude} ../../tagging/taggers/sha.py
 :language: py
+:start-at: class SHATagger
 ```
 
 - `taggers/` subdirectory contains all the taggers.
@@ -72,6 +76,7 @@ All the other manifest classes are inherited from `ManifestInterface`:
 
 ```{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.
@@ -80,14 +85,15 @@ All the other manifest classes are inherited from `ManifestInterface`:
 
 ```{literalinclude} ../../tagging/manifests/apt_packages.py
 :language: py
+:start-at: class AptPackagesManifest
 ```
 
 - `quoted_output(container, cmd)` simply runs the command inside a container using `DockerRunner.run_simple_command` and wraps it to triple quotes to create a valid markdown piece.
   It also adds the command which was run to the markdown piece.
 - `manifests/` subdirectory contains all the manifests.
 - `apps/write_manifest.py` is a Python executable to create the build manifest and history line for an image.
 
-### Images Hierarchy
+## Images Hierarchy
 
 All images' dependencies on each other and what taggers and manifest are applicable to them are defined in `hierarchy/images_hierarchy.py`.
 

docs/maintaining/tagging_examples/docker_runner.py

@@ -1,3 +1,5 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
 from tagging.utils.docker_runner import DockerRunner
 
 with DockerRunner("ubuntu") as container:

docs/maintaining/tagging_examples/git_helper.py

@@ -1,3 +1,5 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
 from tagging.utils.git_helper import GitHelper
 
 print("Git hash:", GitHelper.commit_hash())

tagging/apps/apply_tags.py

@@ -42,20 +42,16 @@ def apply_tags(
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
 
-    arg_parser = common_arguments_parser()
+    arg_parser = common_arguments_parser(
+        registry=True, owner=True, short_image_name=True, variant=True, tags_dir=True
+    )
     arg_parser.add_argument(
         "--platform",
         required=True,
         type=str,
         choices=["x86_64", "aarch64", "arm64"],
         help="Image platform",
     )
-    arg_parser.add_argument(
-        "--tags-dir",
-        required=True,
-        type=Path,
-        help="Directory with saved tags file",
-    )
     args = arg_parser.parse_args()
     args.platform = unify_aarch64(args.platform)
 

tagging/apps/common_cli_arguments.py

@@ -1,11 +1,18 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
 import argparse
+from pathlib import Path
 
 
 def common_arguments_parser(
-    registry: bool = True,
-    owner: bool = True,
-    short_image_name: bool = True,
-    variant: bool = True,
+    *,
+    registry: bool = False,
+    owner: bool = False,
+    short_image_name: bool = False,
+    variant: bool = False,
+    tags_dir: bool = False,
+    hist_lines_dir: bool = False,
+    manifests_dir: bool = False,
 ) -> argparse.ArgumentParser:
     """Add common CLI arguments to parser"""
 
@@ -35,5 +42,26 @@ def common_arguments_parser(
             required=True,
             help="Variant tag prefix",
         )
+    if tags_dir:
+        parser.add_argument(
+            "--tags-dir",
+            required=True,
+            type=Path,
+            help="Directory for tags file",
+        )
+    if hist_lines_dir:
+        parser.add_argument(
+            "--hist-lines-dir",
+            required=True,
+            type=Path,
+            help="Directory for hist_lines file",
+        )
+    if manifests_dir:
+        parser.add_argument(
+            "--manifests-dir",
+            required=True,
+            type=Path,
+            help="Directory for manifests file",
+        )
 
     return parser