Merge branch 'main' into python3.13

jupyter · Dec 14, 2024 · 2573cf7 · 2573cf7
2 parents 10d4f41 + 87b37b4
commit 2573cf7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -61,8 +61,8 @@ repos:
         stages: [manual]
 
   # Autoformat: YAML, JSON, Markdown, etc.
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.4.2
     hooks:
       - id: prettier
 

diff --git a/images/minimal-notebook/setup-scripts/setup_julia.py b/images/minimal-notebook/setup-scripts/setup_julia.py
@@ -47,6 +47,11 @@ def get_latest_julia_url() -> tuple[str, str]:
     triplet = unify_aarch64(platform.machine()) + "-linux-gnu"
     file_info = [vf for vf in latest_version_files if vf["triplet"] == triplet][0]
     LOGGER.info(f"Latest version: {file_info['version']} url: {file_info['url']}")
+    if file_info["version"] == "1.11.2":
+        LOGGER.warning(
+            "Not using Julia 1.11.2, because it hangs in GitHub self-hosted runners"
+        )
+        return file_info["url"].replace("1.11.2", "1.11.1"), "1.11.1"
     return file_info["url"], file_info["version"]
 
 

diff --git a/tests/base-notebook/test_healthcheck.py b/tests/base-notebook/test_healthcheck.py
@@ -82,7 +82,10 @@ def test_healthy(
     "env,cmd,user",
     [
         (
-            ["HTTPS_PROXY=host.docker.internal", "HTTP_PROXY=host.docker.internal"],
+            [
+                "HTTPS_PROXY=https://host.docker.internal",
+                "HTTP_PROXY=http://host.docker.internal",
+            ],
             None,
             None,
         ),
@@ -91,8 +94,8 @@ def test_healthy(
                 "NB_USER=testuser",
                 "CHOWN_HOME=1",
                 "JUPYTER_PORT=8123",
-                "HTTPS_PROXY=host.docker.internal",
-                "HTTP_PROXY=host.docker.internal",
+                "HTTPS_PROXY=https://host.docker.internal",
+                "HTTP_PROXY=http://host.docker.internal",
             ],
             ["start-notebook.py", "--ServerApp.base_url=/test"],
             "root",