Skip to content

Commit 84cd604

Browse files
tiangolotiangolo
authored
Merge branch 'main' into issue-1536-alias-pydantic-v2
2 parents 9440956 + 59adbe7 commit 84cd604

29 files changed

Lines changed: 144 additions & 83 deletions

‎.github/workflows/build-docs.yml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
outputs:
2323
docs: ${{ steps.filter.outputs.docs }}
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
# For pull requests it's not necessary to checkout the code but for the main branch it is
2727
- uses: dorny/paths-filter@v3
2828
id: filter
@@ -33,12 +33,9 @@ jobs:
3333
- docs/**
3434
- docs_src/**
3535
- requirements-docs.txt
36-
- requirements-docs-insiders.txt
3736
- pyproject.toml
3837
- mkdocs.yml
39-
- mkdocs.insiders.yml
40-
- mkdocs.maybe-insiders.yml
41-
- mkdocs.no-insiders.yml
38+
- mkdocs.env.yml
4239
- .github/workflows/build-docs.yml
4340
- .github/workflows/deploy-docs.yml
4441
- data/**
@@ -53,13 +50,13 @@ jobs:
5350
env:
5451
GITHUB_CONTEXT: ${{ toJson(github) }}
5552
run: echo "$GITHUB_CONTEXT"
56-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5754
- name: Set up Python
5855
uses: actions/setup-python@v6
5956
with:
6057
python-version: "3.11"
6158
- name: Setup uv
62-
uses: astral-sh/setup-uv@v6
59+
uses: astral-sh/setup-uv@v7
6360
with:
6461
version: "0.4.15"
6562
enable-cache: true
@@ -68,11 +65,6 @@ jobs:
6865
pyproject.toml
6966
- name: Install docs extras
7067
run: uv pip install -r requirements-docs.txt
71-
- name: Install Material for MkDocs Insiders
72-
if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
73-
run: uv pip install -r requirements-docs-insiders.txt
74-
env:
75-
TOKEN: ${{ secrets.SQLMODEL_MKDOCS_MATERIAL_INSIDERS }}
7668
- uses: actions/cache@v4
7769
with:
7870
key: mkdocs-cards-${{ github.ref }}
@@ -81,7 +73,7 @@ jobs:
8173
run: python ./scripts/docs.py verify-readme
8274
- name: Build Docs
8375
run: python ./scripts/docs.py build
84-
- uses: actions/upload-artifact@v4
76+
- uses: actions/upload-artifact@v5
8577
with:
8678
name: docs-site
8779
path: ./site/**

‎.github/workflows/deploy-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
env:
2424
GITHUB_CONTEXT: ${{ toJson(github) }}
2525
run: echo "$GITHUB_CONTEXT"
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
- name: Set up Python
2828
uses: actions/setup-python@v6
2929
with:
3030
python-version: "3.11"
3131
- name: Setup uv
32-
uses: astral-sh/setup-uv@v6
32+
uses: astral-sh/setup-uv@v7
3333
with:
3434
version: "0.4.15"
3535
enable-cache: true
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
rm -rf ./site
5151
mkdir ./site
52-
- uses: actions/download-artifact@v5
52+
- uses: actions/download-artifact@v6
5353
with:
5454
path: ./site/
5555
pattern: docs-site

‎.github/workflows/issue-manager.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ jobs:
3838
},
3939
"waiting": {
4040
"delay": 2628000,
41-
"message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR."
41+
"message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR.",
42+
"reminder": {
43+
"before": "P3D",
44+
"message": "Heads-up: this will be closed in 3 days unless there’s new activity."
45+
}
4246
},
4347
"invalid": {
4448
"delay": 0,

‎.github/workflows/latest-changes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
latest-changes:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
with:
2525
# To allow latest-changes to commit to the main branch
2626
token: ${{ secrets.SQLMODEL_LATEST_CHANGES }}
@@ -30,7 +30,7 @@ jobs:
3030
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
3131
with:
3232
limit-access-to-actor: true
33-
- uses: tiangolo/latest-changes@0.4.0
33+
- uses: tiangolo/latest-changes@0.4.1
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636
latest_changes_file: docs/release-notes.md

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
permissions:
2323
id-token: write
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- name: Set up Python
2727
uses: actions/setup-python@v6
2828
with:

‎.github/workflows/smokeshow.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,20 @@ env:
1313

1414
jobs:
1515
smokeshow:
16-
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1716
runs-on: ubuntu-latest
1817
steps:
19-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
2019
- uses: actions/setup-python@v6
2120
with:
22-
python-version: '3.9'
21+
python-version: '3.13'
2322
- name: Setup uv
24-
uses: astral-sh/setup-uv@v6
23+
uses: astral-sh/setup-uv@v7
2524
with:
26-
version: "0.4.15"
27-
enable-cache: true
2825
cache-dependency-glob: |
2926
requirements**.txt
3027
pyproject.toml
3128
- run: uv pip install -r requirements-github-actions.txt
32-
- uses: actions/download-artifact@v5
29+
- uses: actions/download-artifact@v6
3330
with:
3431
name: coverage-html
3532
path: htmlcov
@@ -48,7 +45,7 @@ jobs:
4845
done
4946
env:
5047
SMOKESHOW_GITHUB_STATUS_DESCRIPTION: Coverage {coverage-percentage}
51-
SMOKESHOW_GITHUB_COVERAGE_THRESHOLD: 95
48+
SMOKESHOW_GITHUB_COVERAGE_THRESHOLD: 99
5249
SMOKESHOW_GITHUB_CONTEXT: coverage
5350
SMOKESHOW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5451
SMOKESHOW_GITHUB_PR_HEAD_SHA: ${{ github.event.workflow_run.head_sha }}

‎.github/workflows/test-redistribute.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
env:
2323
GITHUB_CONTEXT: ${{ toJson(github) }}
2424
run: echo "$GITHUB_CONTEXT"
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- name: Set up Python
2727
uses: actions/setup-python@v6
2828
with:

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ jobs:
5454
fail-fast: false
5555
runs-on: ${{ matrix.os }}
5656
steps:
57-
- uses: actions/checkout@v5
57+
- uses: actions/checkout@v6
5858
- name: Set up Python
5959
uses: actions/setup-python@v6
6060
with:
6161
python-version: ${{ matrix.python-version }}
6262
- name: Setup uv
63-
uses: astral-sh/setup-uv@v6
63+
uses: astral-sh/setup-uv@v7
6464
with:
6565
version: "0.4.15"
6666
enable-cache: true
@@ -91,7 +91,7 @@ jobs:
9191
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
9292
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
9393
- name: Store coverage files
94-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v5
9595
with:
9696
name: coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
9797
path: coverage
@@ -102,20 +102,20 @@ jobs:
102102
- test
103103
runs-on: ubuntu-latest
104104
steps:
105-
- uses: actions/checkout@v5
105+
- uses: actions/checkout@v6
106106
- uses: actions/setup-python@v6
107107
with:
108108
python-version: '3.13'
109109
- name: Setup uv
110-
uses: astral-sh/setup-uv@v6
110+
uses: astral-sh/setup-uv@v7
111111
with:
112112
version: "0.4.15"
113113
enable-cache: true
114114
cache-dependency-glob: |
115115
requirements**.txt
116116
pyproject.toml
117117
- name: Get coverage files
118-
uses: actions/download-artifact@v5
118+
uses: actions/download-artifact@v6
119119
with:
120120
pattern: coverage-*
121121
path: coverage
@@ -124,14 +124,14 @@ jobs:
124124
run: uv pip install -r requirements-tests.txt
125125
- run: ls -la coverage
126126
- run: coverage combine coverage
127-
- run: coverage report
128127
- run: coverage html --title "Coverage for ${{ github.sha }}"
129128
- name: Store coverage HTML
130-
uses: actions/upload-artifact@v4
129+
uses: actions/upload-artifact@v5
131130
with:
132131
name: coverage-html
133132
path: htmlcov
134133
include-hidden-files: true
134+
- run: coverage report --fail-under=99
135135

136136
# https://github.com/marketplace/actions/alls-green#why
137137
alls-green: # This job does nothing and is only used for the branch protection

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414
- id: end-of-file-fixer
1515
- id: trailing-whitespace
1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.13.3
17+
rev: v0.14.8
1818
hooks:
1919
- id: ruff
2020
args:

‎docs/css/custom.css‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/* Fira Code, including characters used by Rich output, like the "heavy right-pointing angle bracket ornament", not included in Google Fonts */
2+
@import url(https://cdn.jsdelivr.net/npm/firacode@6.2.0/distr/fira_code.css);
3+
/* Noto Color Emoji for emoji support with the same font everywhere */
4+
@import url(https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&display=swap);
5+
6+
/* Override default code font in Material for MkDocs to Fira Code */
7+
:root {
8+
--md-code-font: "Fira Code", monospace, "Noto Color Emoji";
9+
}
10+
11+
/* Override default regular font in Material for MkDocs to include Noto Color Emoji */
12+
:root {
13+
--md-text-font: "Roboto", "Noto Color Emoji";
14+
}
15+
116
.termynal-comment {
217
color: #4a968f;
318
font-style: italic;

0 commit comments

Comments
 (0)