Skip to content

Commit 99b68d3

Browse files
authored
Merge branch 'main' into main
2 parents b1f3f90 + 893f8bd commit 99b68d3

13 files changed

+100
-576
lines changed

.github/workflows/build-docs.yml

+15-8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
types:
88
- opened
99
- synchronize
10+
11+
env:
12+
UV_SYSTEM_PYTHON: 1
13+
14+
1015
jobs:
1116
changes:
1217
runs-on: ubuntu-latest
@@ -52,17 +57,19 @@ jobs:
5257
uses: actions/setup-python@v5
5358
with:
5459
python-version: "3.11"
55-
- uses: actions/cache@v4
56-
id: cache
60+
- name: Setup uv
61+
uses: astral-sh/setup-uv@v3
5762
with:
58-
path: ${{ env.pythonLocation }}
59-
key: ${{ runner.os }}-python-docs-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml', 'requirements-docs.txt', 'requirements-docs-insiders.txt', 'requirements-docs-tests.txt') }}-v02
63+
version: "0.4.15"
64+
enable-cache: true
65+
cache-dependency-glob: |
66+
requirements**.txt
67+
pyproject.toml
6068
- name: Install docs extras
61-
if: steps.cache.outputs.cache-hit != 'true'
62-
run: pip install -r requirements-docs.txt
69+
run: uv pip install -r requirements-docs.txt
6370
- name: Install Material for MkDocs Insiders
64-
if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' ) && steps.cache.outputs.cache-hit != 'true'
65-
run: pip install -r requirements-docs-insiders.txt
71+
if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
72+
run: uv pip install -r requirements-docs-insiders.txt
6673
env:
6774
TOKEN: ${{ secrets.SQLMODEL_MKDOCS_MATERIAL_INSIDERS }}
6875
- uses: actions/cache@v4

.github/workflows/deploy-docs.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ permissions:
1212
pull-requests: write
1313
statuses: write
1414

15+
env:
16+
UV_SYSTEM_PYTHON: 1
17+
1518
jobs:
1619
deploy-docs:
1720
runs-on: ubuntu-latest
@@ -25,14 +28,16 @@ jobs:
2528
uses: actions/setup-python@v5
2629
with:
2730
python-version: "3.11"
28-
- uses: actions/cache@v4
29-
id: cache
31+
- name: Setup uv
32+
uses: astral-sh/setup-uv@v3
3033
with:
31-
path: ${{ env.pythonLocation }}
32-
key: ${{ runner.os }}-python-github-actions-${{ env.pythonLocation }}-${{ hashFiles('requirements-github-actions.txt') }}-v01
34+
version: "0.4.15"
35+
enable-cache: true
36+
cache-dependency-glob: |
37+
requirements**.txt
38+
pyproject.toml
3339
- name: Install GitHub Actions dependencies
34-
if: steps.cache.outputs.cache-hit != 'true'
35-
run: pip install -r requirements-github-actions.txt
40+
run: uv pip install -r requirements-github-actions.txt
3641
- name: Deploy Docs Status Pending
3742
run: python ./scripts/deploy_docs_status.py
3843
env:

.github/workflows/issue-manager.yml

+4
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,9 @@ jobs:
3939
"waiting": {
4040
"delay": 2628000,
4141
"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+
},
43+
"invalid": {
44+
"delay": 0,
45+
"message": "This was marked as invalid and will be closed now. If this is an error, please provide additional details."
4246
}
4347
}

.github/workflows/smokeshow.yml

+13-5
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,33 @@ on:
88
permissions:
99
statuses: write
1010

11+
env:
12+
UV_SYSTEM_PYTHON: 1
13+
1114
jobs:
1215
smokeshow:
1316
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1417
runs-on: ubuntu-latest
15-
1618
steps:
19+
- uses: actions/checkout@v4
1720
- uses: actions/setup-python@v5
1821
with:
1922
python-version: '3.9'
20-
21-
- run: pip install smokeshow
22-
23+
- name: Setup uv
24+
uses: astral-sh/setup-uv@v3
25+
with:
26+
version: "0.4.15"
27+
enable-cache: true
28+
cache-dependency-glob: |
29+
requirements**.txt
30+
pyproject.toml
31+
- run: uv pip install -r requirements-github-actions.txt
2332
- uses: actions/download-artifact@v4
2433
with:
2534
name: coverage-html
2635
path: htmlcov
2736
github-token: ${{ secrets.GITHUB_TOKEN }}
2837
run-id: ${{ github.event.workflow_run.id }}
29-
3038
- run: smokeshow upload htmlcov
3139
env:
3240
SMOKESHOW_GITHUB_STATUS_DESCRIPTION: Coverage {coverage-percentage}

.github/workflows/test.yml

+24-17
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ on:
1818
# cron every week on monday
1919
- cron: "0 0 * * 1"
2020

21+
env:
22+
UV_SYSTEM_PYTHON: 1
23+
2124
jobs:
2225
test:
2326
runs-on: ubuntu-latest
@@ -34,33 +37,34 @@ jobs:
3437
- pydantic-v1
3538
- pydantic-v2
3639
fail-fast: false
37-
3840
steps:
3941
- uses: actions/checkout@v4
4042
- name: Set up Python
4143
uses: actions/setup-python@v5
4244
with:
4345
python-version: ${{ matrix.python-version }}
46+
- name: Setup uv
47+
uses: astral-sh/setup-uv@v3
48+
with:
49+
version: "0.4.15"
50+
enable-cache: true
51+
cache-dependency-glob: |
52+
requirements**.txt
53+
pyproject.toml
4454
# Allow debugging with tmate
4555
- name: Setup tmate session
4656
uses: mxschmitt/action-tmate@v3
4757
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
4858
with:
4959
limit-access-to-actor: true
50-
- uses: actions/cache@v4
51-
id: cache
52-
with:
53-
path: ${{ env.pythonLocation }}
54-
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml', 'requirements-tests.txt') }}-v01
5560
- name: Install Dependencies
56-
if: steps.cache.outputs.cache-hit != 'true'
57-
run: pip install -r requirements-tests.txt
61+
run: uv pip install -r requirements-tests.txt
5862
- name: Install Pydantic v1
5963
if: matrix.pydantic-version == 'pydantic-v1'
60-
run: pip install --upgrade "pydantic>=1.10.0,<2.0.0"
64+
run: uv pip install --upgrade "pydantic>=1.10.0,<2.0.0"
6165
- name: Install Pydantic v2
6266
if: matrix.pydantic-version == 'pydantic-v2'
63-
run: pip install --upgrade "pydantic>=2.0.2,<3.0.0" "typing-extensions==4.6.1"
67+
run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0" "typing-extensions==4.6.1"
6468
- name: Lint
6569
# Do not run on Python 3.7 as mypy behaves differently
6670
if: matrix.python-version != '3.7' && matrix.pydantic-version == 'pydantic-v2'
@@ -82,28 +86,31 @@ jobs:
8286
needs:
8387
- test
8488
runs-on: ubuntu-latest
85-
8689
steps:
8790
- uses: actions/checkout@v4
88-
8991
- uses: actions/setup-python@v5
9092
with:
9193
python-version: '3.12'
92-
94+
- name: Setup uv
95+
uses: astral-sh/setup-uv@v3
96+
with:
97+
version: "0.4.15"
98+
enable-cache: true
99+
cache-dependency-glob: |
100+
requirements**.txt
101+
pyproject.toml
93102
- name: Get coverage files
94103
uses: actions/download-artifact@v4
95104
with:
96105
pattern: coverage-*
97106
path: coverage
98107
merge-multiple: true
99-
100-
- run: pip install coverage[toml]
101-
108+
- name: Install Dependencies
109+
run: uv pip install -r requirements-tests.txt
102110
- run: ls -la coverage
103111
- run: coverage combine coverage
104112
- run: coverage report
105113
- run: coverage html --title "Coverage for ${{ github.sha }}"
106-
107114
- name: Store coverage HTML
108115
uses: actions/upload-artifact@v4
109116
with:

0 commit comments

Comments
 (0)