Skip to content

Commit 90ae020

Browse files
authored
Merge branch 'main' into python3.13
2 parents c0e5655 + 83600cf commit 90ae020

File tree

9 files changed

+23
-28
lines changed

9 files changed

+23
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
- name: Push Wiki to GitHub 📤
4646
if: env.PUSH_TO_REGISTRY == 'true'
47-
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
47+
uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
4848
with:
4949
commit_message: "Automated wiki publish for ${{ github.sha }}"
5050
repository: wiki/

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ cython_debug/
167167
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
168168
#.idea/
169169

170+
# Ruff stuff:
171+
.ruff_cache/
172+
170173
# PyPI configuration file
171174
.pypirc
172175

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ repos:
2121

2222
# Automatically sort python imports
2323
- repo: https://github.com/PyCQA/isort
24-
rev: 5.13.2
24+
rev: 6.0.0
2525
hooks:
2626
- id: isort
2727
args: [--profile, black]
2828

2929
# Autoformat: Python code
3030
- repo: https://github.com/psf/black
31-
rev: 24.10.0
31+
rev: 25.1.0
3232
hooks:
3333
- id: black
3434
args: [--target-version=py39]
@@ -123,11 +123,11 @@ repos:
123123
- id: flake8
124124

125125
# Lint: Markdown
126-
- repo: https://github.com/igorshubovych/markdownlint-cli
127-
rev: v0.43.0
126+
- repo: https://github.com/DavidAnson/markdownlint-cli2
127+
rev: v0.17.2
128128
hooks:
129-
- id: markdownlint
130-
args: ["--fix"]
129+
- id: markdownlint-cli2
130+
args: [--fix]
131131

132132
# Strip output from Jupyter notebooks
133133
- repo: https://github.com/kynan/nbstripout

docs/maintaining/aarch64-runner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Each runner is recommended to have at least _2 cores_ and _30 GB_ of disk space.
66

77
Add a new runner:
88

9-
- To use [Oracle OCI](https://www.oracle.com/cloud-0/), create a compute instance `VM.Standard.A1.Flex`.
9+
- To use [Oracle OCI](https://www.oracle.com/cloud/), create a compute instance `VM.Standard.A1.Flex`.
1010
- To use [Google Cloud](https://cloud.google.com), use [this instruction](https://cloud.google.com/compute/docs/instances/create-start-instance).
1111

1212
Configure your runner:

images/base-notebook/jupyter_server_config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
from jupyter_core.paths import jupyter_data_dir
1010

1111
c = get_config() # noqa: F821
12-
c.ServerApp.ip = "0.0.0.0"
12+
# Listen on all interfaces (ipv4 and ipv6)
13+
c.ServerApp.ip = ""
1314
c.ServerApp.open_browser = False
1415

1516
# to output both image/svg+xml and application/pdf plot formats in the notebook file

images/base-notebook/start-singleuser.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# Entrypoint is start.sh
99
command = ["jupyterhub-singleuser"]
1010

11-
# set default ip to 0.0.0.0
12-
if "--ip=" not in os.environ.get("NOTEBOOK_ARGS", ""):
13-
command.append("--ip=0.0.0.0")
11+
# JupyterHub singleuser arguments are set using environment variables
1412

1513
# Append any optional NOTEBOOK_ARGS we were passed in.
1614
# This is supposed to be multiple args passed on to the notebook command,

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@
2020

2121
def unify_aarch64(platform: str) -> str:
2222
"""
23-
Renames arm64->aarch64 to support local builds on on aarch64 Macs
23+
Renames arm64->aarch64 to support local builds on aarch64 Macs
2424
"""
25-
return {
26-
"aarch64": "aarch64",
27-
"arm64": "aarch64",
28-
"x86_64": "x86_64",
29-
}[platform]
25+
return {"arm64": "aarch64"}.get(platform, platform)
3026

3127

3228
def get_latest_julia_url() -> tuple[str, str]:
@@ -47,11 +43,12 @@ def get_latest_julia_url() -> tuple[str, str]:
4743
triplet = unify_aarch64(platform.machine()) + "-linux-gnu"
4844
file_info = [vf for vf in latest_version_files if vf["triplet"] == triplet][0]
4945
LOGGER.info(f"Latest version: {file_info['version']} url: {file_info['url']}")
50-
if file_info["version"] == "1.11.2":
46+
BROKEN_VERSION = "1.11.3"
47+
if file_info["version"] == BROKEN_VERSION:
5148
LOGGER.warning(
52-
"Not using Julia 1.11.2, because it hangs in GitHub self-hosted runners"
49+
f"Not using Julia {BROKEN_VERSION}, because it hangs in GitHub self-hosted runners"
5350
)
54-
return file_info["url"].replace("1.11.2", "1.11.1"), "1.11.1"
51+
return file_info["url"].replace(BROKEN_VERSION, "1.11.1"), "1.11.1"
5552
return file_info["url"], file_info["version"]
5653

5754

tagging/get_platform.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77

88
def unify_aarch64(platform: str) -> str:
99
"""
10-
Renames arm64->aarch64 to support local builds on on aarch64 Macs
10+
Renames arm64->aarch64 to support local builds on aarch64 Macs
1111
"""
12-
return {
13-
"aarch64": "aarch64",
14-
"arm64": "aarch64",
15-
"x86_64": "x86_64",
16-
}[platform]
12+
return {"arm64": "aarch64"}.get(platform, platform)
1713

1814

1915
def get_platform() -> str:

tests/package_helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def requested_packages(self) -> dict[str, set[str]]:
9090

9191
def _execute_command(self, command: list[str]) -> str:
9292
"""Execute a command on a running container"""
93-
rc = self.running_container.exec_run(command)
93+
rc = self.running_container.exec_run(command, stderr=False)
9494
return rc.output.decode("utf-8") # type: ignore
9595

9696
@staticmethod

0 commit comments

Comments
 (0)