Merge branch 'main' into python3.13

Author: mathbunnyru

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

@@ -59,7 +59,7 @@ jobs:
 
       - name: Login to Registry 🔐
         if: env.PUSH_TO_REGISTRY == 'true'
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: quay.io
           username: ${{ secrets.REGISTRY_USERNAME }}

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

@@ -49,7 +49,7 @@ jobs:
 
       - name: Login to Registry 🔐
         if: env.PUSH_TO_REGISTRY == 'true'
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: quay.io
           username: ${{ secrets.REGISTRY_USERNAME }}

CHANGELOG.md

@@ -9,6 +9,12 @@ Affected: all images.
 
 - **Breaking:** `docker-stacks-foundation`: switch to Python 3.13 ([#2163](https://github.com/jupyter/docker-stacks/pull/2163)).
 
+## 2025-03-23
+
+Affected: `tensorflow-notebook`.
+
+- **Non-breaking:** `tensorflow-notebook`: Use mamba to install jupyter-server-proxy ([#2262](https://github.com/jupyter/docker-stacks/pull/2262)).
+
 ## 2025-03-22
 
 Affected: all images.

docs/using/selecting.md

@@ -113,7 +113,7 @@ It contains:
   [rodbc](https://cran.r-project.org/web/packages/RODBC/index.html),
   [rsqlite](https://cran.r-project.org/web/packages/RSQLite/index.html),
   [shiny](https://shiny.posit.co),
-  [tidymodels](https://www.tidymodels.org/),
+  [tidymodels](https://tidymodels.org/),
   [unixodbc](https://www.unixodbc.org)
   packages from [conda-forge](https://conda-forge.org/feedstock-outputs/index.html)
 

images/tensorflow-notebook/Dockerfile

@@ -11,10 +11,15 @@ LABEL maintainer="Jupyter Project <[email protected]>"
 # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+RUN mamba install --yes \
+    'jupyter-server-proxy' && \
+    mamba clean --all -f -y && \
+    fix-permissions "${CONDA_DIR}" && \
+    fix-permissions "/home/${NB_USER}"
+
 # Install tensorflow with pip, on x86_64 tensorflow-cpu
 RUN [[ $(uname -m) = x86_64 ]] && TF_POSTFIX="-cpu" || TF_POSTFIX="" && \
     pip install --no-cache-dir \
-    "jupyter-server-proxy" \
     "tensorflow${TF_POSTFIX}" && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"

images/tensorflow-notebook/cuda/Dockerfile

@@ -11,9 +11,14 @@ LABEL maintainer="Jupyter Project <[email protected]>"
 # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+RUN mamba install --yes \
+    'jupyter-server-proxy' && \
+    mamba clean --all -f -y && \
+    fix-permissions "${CONDA_DIR}" && \
+    fix-permissions "/home/${NB_USER}"
+
 # Install TensorFlow, CUDA and cuDNN with pip
 RUN pip install --no-cache-dir \
-    "jupyter-server-proxy" \
     "tensorflow[and-cuda]<=2.17.1" && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"

tagging/utils/docker_runner.py

@@ -47,6 +47,9 @@ def exec_cmd(container: Container, cmd: str) -> str:
         exec_result = container.exec_run(cmd)
         output = exec_result.output.decode().rstrip()
         assert isinstance(output, str)
-        LOGGER.debug(f"Command output: {output}")
-        assert exec_result.exit_code == 0, f"Command: `{cmd}` failed"
+        if exec_result.exit_code != 0:
+            LOGGER.error(f"Command output:\n{output}")
+            raise AssertionError(f"Command: `{cmd}` failed")
+        else:
+            LOGGER.debug(f"Command output:\n{output}")
         return output

tests/by_image/docker-stacks-foundation/test_packages.py

@@ -54,6 +54,7 @@
     "grpcio-status",
     "grpcio",
     "hdf5",
+    "jupyter-server-proxy",
     "jupyterhub-singleuser",
     "jupyterlab-git",
     "mamba",

tests/utils/tracked_container.py

@@ -75,8 +75,11 @@ def exec_cmd(self, cmd: str, **kwargs: Any) -> str:
         exec_result = container.exec_run(cmd, **final_kwargs)
         output = exec_result.output.decode().rstrip()
         assert isinstance(output, str)
-        LOGGER.debug(f"Command output: {output}")
-        assert exec_result.exit_code == 0, f"Command: `{cmd}` failed"
+        if exec_result.exit_code != 0:
+            LOGGER.error(f"Command output:\n{output}")
+            raise AssertionError(f"Command: `{cmd}` failed")
+        else:
+            LOGGER.debug(f"Command output:\n{output}")
         return output
 
     def run_and_wait(
@@ -91,10 +94,15 @@ def run_and_wait(
         assert self.container is not None
         rv = self.container.wait(timeout=timeout)
         logs = self.get_logs()
-        LOGGER.debug(logs)
+        failed = rv["StatusCode"] != 0
+
+        if failed:
+            LOGGER.error(f"Command output:\n{logs}")
+        else:
+            LOGGER.debug(f"Command output:\n{logs}")
+        assert no_failure != failed
         assert no_warnings == (not self.get_warnings(logs))
         assert no_errors == (not self.get_errors(logs))
-        assert no_failure == (rv["StatusCode"] == 0)
         self.remove()
         return logs