Merge branch 'master' into asalikhov/modules

.github/workflows/docker-amd64.yml

@@ -48,6 +48,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   build-test-amd64-images:
     name: Build and test amd64 Docker Images

.github/workflows/docker.yml

@@ -108,7 +108,7 @@ jobs:
 
       - name: Push Wiki to GitHub
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.event_name == 'schedule'
-        uses: stefanzweifel/git-auto-commit-action@c4b132ec2c77a21fcab564bd3c92610cee84b894 # dependabot updates to latest release
+        uses: stefanzweifel/git-auto-commit-action@49620cd3ed21ee620a48530e81dba0d139c9cb80 # dependabot updates to latest release
         with:
           commit_message: "Automated wiki publish for ${{github.sha}}"
           repository: wiki/

.github/workflows/pre-commit.yml

@@ -8,6 +8,9 @@ on:
       - master
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   run-hooks:
     name: Run pre-commit hooks

.pre-commit-config.yaml

@@ -14,7 +14,7 @@
 repos:
   # Autoupdate: Python code
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
@@ -52,13 +52,13 @@ repos:
 
   # Autoformat: YAML, JSON, Markdown, etc.
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.6.1
+    rev: v2.6.2
     hooks:
       - id: prettier
 
   # `pre-commit sample-config` default hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: check-added-large-files
       - id: end-of-file-fixer

base-notebook/Dockerfile

@@ -175,7 +175,7 @@ RUN sed -re "s/c.ServerApp/c.NotebookApp/g" \
 # This healtcheck works well for `lab`, `notebook`, `nbclassic`, `server` and `retro` jupyter commands
 # https://github.com/jupyter/docker-stacks/issues/915#issuecomment-1068528799
 HEALTHCHECK  --interval=15s --timeout=3s --start-period=5s --retries=3 \
-    CMD wget -O- --no-verbose --tries=1 http://localhost:8888/api || exit 1
+    CMD wget -O- --no-verbose --tries=1 http://localhost:8888${JUPYTERHUB_SERVICE_PREFIX:-/}api || exit 1
 
 # Switch back to jovyan to avoid accidental container runs as root
 USER ${NB_UID}

base-notebook/start-notebook.sh

@@ -18,9 +18,5 @@ if [[ "${RESTARTABLE}" == "yes" ]]; then
     wrapper="run-one-constantly"
 fi
 
-if [[ -v JUPYTER_ENABLE_LAB ]]; then
-    echo "WARNING: JUPYTER_ENABLE_LAB is ignored, use DOCKER_STACKS_JUPYTER_CMD if you want to change the command used to start the server"
-fi
-
 # shellcheck disable=SC1091,SC2086
 exec /usr/local/bin/start.sh ${wrapper} jupyter ${DOCKER_STACKS_JUPYTER_CMD} ${NOTEBOOK_ARGS} "$@"

docs/conf.py

@@ -91,6 +91,7 @@ myst_heading_anchors = 3
 
 linkcheck_ignore = [
     r".*github\.com.*#",  # javascript based anchors
+    r"https://docs.github\.com/.*",  # 403 error
     r"http://127\.0\.0\.1:49153/.*",  # example
     r"https://mybinder\.org/v2/gh/.*",  # lots of 500 errors
 ]

docs/using/recipes.md

@@ -513,7 +513,7 @@ By adding the properties to `spark-defaults.conf`, the user no longer needs to e
 ```dockerfile
 FROM jupyter/pyspark-notebook:latest
 
-ARG DELTA_CORE_VERSION="1.1.0"
+ARG DELTA_CORE_VERSION="1.2.0"
 RUN pip install --quiet --no-cache-dir delta-spark==${DELTA_CORE_VERSION} && \
      fix-permissions "${HOME}" && \
      fix-permissions "${CONDA_DIR}"

tagging/manifests.py

@@ -67,7 +67,7 @@ class CondaEnvironmentManifest(ManifestInterface):
                 "",
                 quoted_output(container, "python --version"),
                 "",
-                quoted_output(container, "mamba info"),
+                quoted_output(container, "mamba info --quiet"),
                 "",
                 quoted_output(container, "mamba list"),
             ]

tests/base-notebook/test_start_container.py

@@ -16,12 +16,6 @@ LOGGER = logging.getLogger(__name__)
 @pytest.mark.parametrize(
     "env,expected_command,expected_start,expected_warnings",
     [
-        (
-            ["JUPYTER_ENABLE_LAB=yes"],
-            "jupyter lab",
-            True,
-            ["WARNING: JUPYTER_ENABLE_LAB is ignored"],
-        ),
         (None, "jupyter lab", True, []),
         (["DOCKER_STACKS_JUPYTER_CMD=lab"], "jupyter lab", True, []),
         (["RESTARTABLE=yes"], "run-one-constantly jupyter lab", True, []),