Skip to content

Commit c735a16

Browse files
authored
Merge branch 'main' into python3.13
2 parents 00c82fb + 3d9ce7c commit c735a16

35 files changed

+340
-246
lines changed

.github/actions/create-dev-env/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
- name: Set Up Python 🐍
88
uses: actions/setup-python@v5
99
with:
10-
python-version: "3.12"
10+
python-version: 3.12
1111

1212
- name: Install Dev Dependencies 📦
1313
run: |

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To get started with Dependabot version updates, you'll need to specify which
22
# package ecosystems to update and where the package manifests are located.
33
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
4+
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference
55

66
version: 2
77
updates:

.github/workflows/contributed-recipes.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ on:
2929
jobs:
3030
generate-matrix:
3131
runs-on: ubuntu-24.04
32+
timeout-minutes: 1
3233
outputs:
3334
matrix: ${{ steps.set-matrix.outputs.matrix }}
3435
steps:
@@ -43,6 +44,7 @@ jobs:
4344

4445
test-recipes:
4546
runs-on: ${{ matrix.runs-on }}
47+
timeout-minutes: 5
4648
needs: generate-matrix
4749
if: github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru'
4850

.github/workflows/docker-build-test-upload.yml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@ on:
3333
description: GitHub Actions Runner image
3434
required: true
3535
type: string
36+
timeout-minutes:
37+
description: Timeout in minutes
38+
required: true
39+
type: number
3640

3741
jobs:
3842
build-test-upload:
3943
runs-on: ${{ inputs.runs-on }}
44+
timeout-minutes: ${{ inputs.timeout-minutes }}
4045

4146
steps:
4247
- name: Checkout Repo ⚡️
@@ -58,16 +63,27 @@ jobs:
5863
shell: bash
5964

6065
- name: Build image 🛠
61-
run: docker build --rm --force-rm --tag ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }} images/${{ inputs.image }}/${{ inputs.variant != 'default' && inputs.variant || '.' }}/ --build-arg REGISTRY=${{ env.REGISTRY }} --build-arg OWNER=${{ env.OWNER }}
66+
run: >
67+
docker build
68+
--rm --force-rm
69+
--tag ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }}
70+
images/${{ inputs.image }}/${{ inputs.variant != 'default' && inputs.variant || '.' }}/
71+
--build-arg REGISTRY=${{ env.REGISTRY }}
72+
--build-arg OWNER=${{ env.OWNER }}
6273
env:
6374
DOCKER_BUILDKIT: 1
6475
# Full logs for CI build
6576
BUILDKIT_PROGRESS: plain
6677
shell: bash
6778

6879
- name: Write tags file 🏷
69-
run: |
70-
python3 -m tagging.write_tags_file --short-image-name ${{ inputs.image }} --tags-dir /tmp/jupyter/tags/ --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }} --variant ${{ inputs.variant }}
80+
run: >
81+
python3 -m tagging.write_tags_file
82+
--registry ${{ env.REGISTRY }}
83+
--owner ${{ env.OWNER }}
84+
--short-image-name ${{ inputs.image }}
85+
--variant ${{ inputs.variant }}
86+
--tags-dir /tmp/jupyter/tags/
7187
shell: bash
7288
- name: Upload tags file 💾
7389
uses: actions/upload-artifact@v4
@@ -77,7 +93,14 @@ jobs:
7793
retention-days: 3
7894

7995
- name: Write manifest and build history file 🏷
80-
run: python3 -m tagging.write_manifest --short-image-name ${{ inputs.image }} --hist-lines-dir /tmp/jupyter/hist_lines/ --manifests-dir /tmp/jupyter/manifests/ --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }} --variant ${{ inputs.variant }}
96+
run: >
97+
python3 -m tagging.write_manifest
98+
--registry ${{ env.REGISTRY }}
99+
--owner ${{ env.OWNER }}
100+
--short-image-name ${{ inputs.image }}
101+
--variant ${{ inputs.variant }}
102+
--hist-lines-dir /tmp/jupyter/hist_lines/
103+
--manifests-dir /tmp/jupyter/manifests/
81104
shell: bash
82105
- name: Upload manifest file 💾
83106
uses: actions/upload-artifact@v4
@@ -105,5 +128,9 @@ jobs:
105128
retention-days: 3
106129

107130
- name: Run tests ✅
108-
run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
131+
run: >
132+
python3 -m tests.run_tests
133+
--registry ${{ env.REGISTRY }}
134+
--owner ${{ env.OWNER }}
135+
--short-image-name ${{ inputs.image }}
109136
shell: bash

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
description: Image name
1616
required: true
1717
type: string
18+
timeout-minutes:
19+
description: Timeout in minutes
20+
type: number
21+
default: 25
1822
secrets:
1923
REGISTRY_USERNAME:
2024
required: true
@@ -24,6 +28,7 @@ on:
2428
jobs:
2529
merge-tags:
2630
runs-on: ubuntu-24.04
31+
timeout-minutes: ${{ inputs.timeout-minutes }}
2732

2833
steps:
2934
- name: Checkout Repo ⚡️
@@ -62,5 +67,9 @@ jobs:
6267

6368
- name: Merge tags for the images 🔀
6469
if: env.PUSH_TO_REGISTRY == 'true'
65-
run: python3 -m tagging.merge_tags --short-image-name ${{ inputs.image }} --tags-dir /tmp/jupyter/tags/ --variant ${{ inputs.variant }}
70+
run: >
71+
python3 -m tagging.merge_tags
72+
--short-image-name ${{ inputs.image }}
73+
--variant ${{ inputs.variant }}
74+
--tags-dir /tmp/jupyter/tags/
6675
shell: bash

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
description: Variant tag prefix
2121
required: true
2222
type: string
23+
timeout-minutes:
24+
description: Timeout in minutes
25+
default: 25
26+
type: number
2327
secrets:
2428
REGISTRY_USERNAME:
2529
required: true
@@ -29,6 +33,7 @@ on:
2933
jobs:
3034
tag-push:
3135
runs-on: ubuntu-24.04
36+
timeout-minutes: ${{ inputs.timeout-minutes }}
3237

3338
steps:
3439
- name: Checkout Repo ⚡️
@@ -56,7 +61,14 @@ jobs:
5661
name: ${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}-tags
5762
path: /tmp/jupyter/tags/
5863
- name: Apply tags to the loaded image 🏷
59-
run: python3 -m tagging.apply_tags --short-image-name ${{ inputs.image }} --tags-dir /tmp/jupyter/tags/ --platform ${{ inputs.platform }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }} --variant ${{ inputs.variant }}
64+
run: >
65+
python3 -m tagging.apply_tags
66+
--registry ${{ env.REGISTRY }}
67+
--owner ${{ env.OWNER }}
68+
--short-image-name ${{ inputs.image }}
69+
--variant ${{ inputs.variant }}
70+
--platform ${{ inputs.platform }}
71+
--tags-dir /tmp/jupyter/tags/
6072
# This step is needed to prevent pushing non-multi-arch "latest" tag
6173
- name: Remove the "latest" tag from the image 🗑️
6274
run: docker image rmi ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }}:latest

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ name: Download build manifests from GitHub artifacts and push them to GitHub wik
33
# This way we make sure we don't access wiki pages from several jobs simultaneously
44

55
env:
6-
PUSH_TO_REGISTRY: ${{ (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && (github.ref == 'refs/heads/main' || github.event_name == 'schedule') }}
6+
PUSH_TO_REGISTRY: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}
77

88
on:
99
workflow_call:
1010

1111
jobs:
1212
wiki-update:
1313
runs-on: ubuntu-24.04
14+
timeout-minutes: 1
1415

1516
steps:
1617
- name: Checkout Repo ⚡️
@@ -39,7 +40,12 @@ jobs:
3940
path: wiki/
4041

4142
- name: Update wiki 🏷
42-
run: python3 -m tagging.update_wiki --wiki-dir wiki/ --hist-lines-dir /tmp/jupyter/hist_lines/ --manifests-dir /tmp/jupyter/manifests/
43+
run: >
44+
python3 -m tagging.update_wiki
45+
--wiki-dir wiki/
46+
--hist-lines-dir /tmp/jupyter/hist_lines/
47+
--manifests-dir /tmp/jupyter/manifests/
48+
--repository ${{ github.repository }}
4349
shell: bash
4450

4551
- name: Push Wiki to GitHub 📤

0 commit comments

Comments
 (0)