Skip to content

Commit 2573cf7

Browse files
authored
Merge branch 'main' into python3.13
2 parents 10d4f41 + 87b37b4 commit 2573cf7

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ repos:
6161
stages: [manual]
6262

6363
# Autoformat: YAML, JSON, Markdown, etc.
64-
- repo: https://github.com/pre-commit/mirrors-prettier
65-
rev: v4.0.0-alpha.8
64+
- repo: https://github.com/rbubley/mirrors-prettier
65+
rev: v3.4.2
6666
hooks:
6767
- id: prettier
6868

images/minimal-notebook/setup-scripts/setup_julia.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ def get_latest_julia_url() -> tuple[str, str]:
4747
triplet = unify_aarch64(platform.machine()) + "-linux-gnu"
4848
file_info = [vf for vf in latest_version_files if vf["triplet"] == triplet][0]
4949
LOGGER.info(f"Latest version: {file_info['version']} url: {file_info['url']}")
50+
if file_info["version"] == "1.11.2":
51+
LOGGER.warning(
52+
"Not using Julia 1.11.2, because it hangs in GitHub self-hosted runners"
53+
)
54+
return file_info["url"].replace("1.11.2", "1.11.1"), "1.11.1"
5055
return file_info["url"], file_info["version"]
5156

5257

tests/base-notebook/test_healthcheck.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ def test_healthy(
8282
"env,cmd,user",
8383
[
8484
(
85-
["HTTPS_PROXY=host.docker.internal", "HTTP_PROXY=host.docker.internal"],
85+
[
86+
"HTTPS_PROXY=https://host.docker.internal",
87+
"HTTP_PROXY=http://host.docker.internal",
88+
],
8689
None,
8790
None,
8891
),
@@ -91,8 +94,8 @@ def test_healthy(
9194
"NB_USER=testuser",
9295
"CHOWN_HOME=1",
9396
"JUPYTER_PORT=8123",
94-
"HTTPS_PROXY=host.docker.internal",
95-
"HTTP_PROXY=host.docker.internal",
97+
"HTTPS_PROXY=https://host.docker.internal",
98+
"HTTP_PROXY=http://host.docker.internal",
9699
],
97100
["start-notebook.py", "--ServerApp.base_url=/test"],
98101
"root",

0 commit comments

Comments
 (0)