Skip to content

Commit 581ae66

Browse files
committed
Merge 'jupyterhub:main' into autocreate-pages-branch
2 parents d5fce65 + 83ca3b4 commit 581ae66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2299
-818
lines changed

.bumpversion.cfg

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/dependabot.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# dependabot.yaml reference: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
2+
#
3+
# Notes:
4+
# - Status and logs from dependabot are provided at
5+
# https://github.com/jupyterhub/chartpress/network/updates.
6+
# - YAML anchors are not supported here or in GitHub Workflows.
7+
#
8+
version: 2
9+
updates:
10+
# Maintain dependencies in our GitHub Workflows
11+
- package-ecosystem: github-actions
12+
directory: /
13+
schedule:
14+
interval: monthly
15+
groups:
16+
actions:
17+
patterns:
18+
- "*"
19+
cooldown:
20+
default-days: 7

.github/dependabot.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/publish.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# This is a GitHub workflow defining a set of jobs with a set of steps.
2+
# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
3+
#
4+
name: Release
5+
6+
# Always tests wheel building, but only publish to PyPI on pushed tags.
7+
on:
8+
pull_request:
9+
paths-ignore:
10+
- ".github/workflows/*.yaml"
11+
- "!.github/workflows/release.yaml"
12+
push:
13+
paths-ignore:
14+
- ".github/workflows/*.yaml"
15+
- "!.github/workflows/release.yaml"
16+
branches-ignore:
17+
- "dependabot/**"
18+
- "pre-commit-ci-update-config"
19+
tags:
20+
- "**"
21+
workflow_dispatch:
22+
23+
permissions:
24+
contents: read
25+
26+
jobs:
27+
build-release:
28+
runs-on: ubuntu-24.04
29+
steps:
30+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
31+
with:
32+
persist-credentials: false
33+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
34+
with:
35+
python-version: "3.13"
36+
37+
- name: install build requirements
38+
run: |
39+
pip install --upgrade pip
40+
pip install build
41+
pip list --format=freeze
42+
43+
- name: build release
44+
run: |
45+
python -m build --sdist --wheel .
46+
ls -l dist
47+
48+
# ref: https://github.com/actions/upload-artifact#readme
49+
- name: upload dists
50+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
51+
with:
52+
name: ${{ github.repository.name }}-dist
53+
path: dist/
54+
55+
pypi-publish:
56+
runs-on: ubuntu-24.04
57+
if: startsWith(github.ref, 'refs/tags/')
58+
environment:
59+
name: release
60+
needs:
61+
- build-release
62+
permissions:
63+
id-token: write
64+
65+
steps:
66+
- name: Get release artifacts
67+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
68+
with:
69+
name: ${{ github.repository.name }}-dist
70+
path: dist/
71+
72+
- name: Publish to PyPI
73+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # release/v1

.github/workflows/test.yaml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This is a GitHub workflow defining a set of jobs with a set of steps.
2-
# ref: https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions
2+
# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
33
#
44
name: Test
55

@@ -19,9 +19,12 @@ on:
1919
- "pre-commit-ci-update-config"
2020
workflow_dispatch:
2121

22+
permissions:
23+
contents: read
24+
2225
jobs:
2326
chart-tests:
24-
runs-on: ubuntu-20.04
27+
runs-on: ubuntu-22.04
2528

2629
strategy:
2730
# Keep running even if one variation of the job fail
@@ -36,6 +39,9 @@ jobs:
3639
- python: "3.8"
3740
- python: "3.9"
3841
- python: "3.10"
42+
- python: "3.11"
43+
- python: "3.12"
44+
- python: "3.13"
3945

4046
services:
4147
local-registry:
@@ -44,22 +50,22 @@ jobs:
4450
- 5000:5000
4551

4652
steps:
47-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4854
with:
4955
# chartpress requires the full history
5056
fetch-depth: 0
57+
persist-credentials: false
5158

52-
# NOTE: actions/setup-python@v4 make use of a cache within the GitHub base
59+
# NOTE: actions/setup-python@v6 make use of a cache within the GitHub base
5360
# environment and setup in a fraction of a second.
54-
- uses: actions/setup-python@v4
61+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
5562
with:
5663
python-version: "${{ matrix.python }}"
5764

5865
- name: Install Python dependencies
5966
run: |
6067
pip install --upgrade pip
61-
pip install .
62-
pip install -r dev-requirements.txt
68+
pip install ".[test]"
6369
pip freeze
6470
6571
- name: Install helm
@@ -75,7 +81,7 @@ jobs:
7581

7682
# https://github.com/docker/setup-buildx-action
7783
- name: Setup docker buildx
78-
uses: docker/setup-buildx-action@v2
84+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
7985
with:
8086
# Allows pushing to registry on localhost:5000
8187
driver-opts: network=host
@@ -99,4 +105,9 @@ jobs:
99105
100106
- name: Run tests
101107
run: |
102-
pytest --verbose --color=yes
108+
pytest
109+
env:
110+
HELM2: ${{ matrix.helm2 }}
111+
112+
# GitHub action reference: https://github.com/codecov/codecov-action
113+
- uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6

.pre-commit-config.yaml

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,35 @@
99
# - Register git hooks: pre-commit install --install-hooks
1010
#
1111
repos:
12+
# Autoformat: Python code, syntax patterns are modernized
13+
- repo: https://github.com/asottile/pyupgrade
14+
rev: 75992aaa40730136014f34227e0135f63fc951b4 # frozen: v3.21.2
15+
hooks:
16+
- id: pyupgrade
17+
args:
18+
- --py37-plus
19+
1220
# Autoformat: Python code
13-
- repo: https://github.com/psf/black
14-
rev: 22.3.0
21+
- repo: https://github.com/psf/black-pre-commit-mirror
22+
rev: fa505ab9c3e0fedafe1709fd7ac2b5f8996c670d # frozen: 26.3.1
1523
hooks:
1624
- id: black
17-
args: [--target-version=py36]
1825

19-
# Autoformat: markdown, yaml
20-
- repo: https://github.com/pre-commit/mirrors-prettier
21-
rev: v2.6.2
26+
# Autoformat: Python code
27+
- repo: https://github.com/pycqa/isort
28+
rev: a333737ed43df02b18e6c95477ea1b285b3de15a # frozen: 8.0.1
2229
hooks:
23-
- id: prettier
30+
- id: isort
2431

25-
# Autoformat: https://github.com/asottile/reorder_python_imports
26-
- repo: https://github.com/asottile/reorder_python_imports
27-
rev: v3.1.0
32+
# Autoformat: markdown, yaml
33+
- repo: https://github.com/rbubley/mirrors-prettier
34+
rev: c2bc67fe8f8f549cc489e00ba8b45aa18ee713b1 # frozen: v3.8.1
2835
hooks:
29-
- id: reorder-python-imports
36+
- id: prettier
3037

3138
# Misc...
3239
- repo: https://github.com/pre-commit/pre-commit-hooks
33-
rev: v4.2.0
40+
rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
3441
# ref: https://github.com/pre-commit/pre-commit-hooks#hooks-available
3542
hooks:
3643
# Autoformat: Makes sure files end in a newline and only a newline.
@@ -48,6 +55,18 @@ repos:
4855

4956
# Lint: Python code
5057
- repo: https://github.com/PyCQA/flake8
51-
rev: "4.0.1"
58+
rev: "d93590f5be797aabb60e3b09f2f52dddb02f349f" # frozen: 7.3.0
5259
hooks:
5360
- id: flake8
61+
62+
# github actions security checks
63+
- repo: https://github.com/zizmorcore/zizmor-pre-commit
64+
rev: ea2eb407b4cbce87cf0d502f36578950494f5ac9 # frozen: v1.23.1
65+
hooks:
66+
- id: zizmor
67+
args:
68+
- --fix=all
69+
70+
# pre-commit.ci config reference: https://pre-commit.ci/#configuration
71+
ci:
72+
autoupdate_schedule: monthly

.readthedocs.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: 2
2+
sphinx:
3+
configuration: docs/source/conf.py
4+
python:
5+
install:
6+
- requirements: docs/requirements.txt
7+
- method: pip
8+
path: .
9+
build:
10+
os: "ubuntu-24.04"
11+
tools:
12+
python: "3.13"
13+
jobs:
14+
pre_build:
15+
- cd docs && ./create-zip.sh

0 commit comments

Comments
 (0)