Skip to content

Commit 85331af

Browse files
YuriiMotovYuriiMotov
authored
Merge branch 'main' into relationship-inheritance
2 parents 46c8d62 + 2bfcad1 commit 85331af

27 files changed

+349
-85
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ jobs:
5555
run: echo "$GITHUB_CONTEXT"
5656
- uses: actions/checkout@v5
5757
- name: Set up Python
58-
uses: actions/setup-python@v5
58+
uses: actions/setup-python@v6
5959
with:
6060
python-version: "3.11"
6161
- name: Setup uv
62-
uses: astral-sh/setup-uv@v6
62+
uses: astral-sh/setup-uv@v7
6363
with:
6464
version: "0.4.15"
6565
enable-cache: true
@@ -81,7 +81,7 @@ jobs:
8181
run: python ./scripts/docs.py verify-readme
8282
- name: Build Docs
8383
run: python ./scripts/docs.py build
84-
- uses: actions/upload-artifact@v4
84+
- uses: actions/upload-artifact@v5
8585
with:
8686
name: docs-site
8787
path: ./site/**

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
run: echo "$GITHUB_CONTEXT"
2626
- uses: actions/checkout@v5
2727
- name: Set up Python
28-
uses: actions/setup-python@v5
28+
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
@@ -44,12 +44,12 @@ jobs:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4545
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
4646
RUN_ID: ${{ github.run_id }}
47-
47+
STATE: "pending"
4848
- name: Clean site
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
@@ -68,11 +68,19 @@ jobs:
6868
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6969
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
7070
command: pages deploy ./site --project-name=${{ env.PROJECT_NAME }} --branch=${{ env.BRANCH }}
71+
- name: Deploy Docs Status Error
72+
if: failure()
73+
run: python ./scripts/deploy_docs_status.py
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
77+
RUN_ID: ${{ github.run_id }}
78+
STATE: "error"
7179
- name: Comment Deploy
7280
run: python ./scripts/deploy_docs_status.py
7381
env:
7482
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7583
DEPLOY_URL: ${{ steps.deploy.outputs.deployment-url }}
7684
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
7785
RUN_ID: ${{ github.run_id }}
78-
IS_DONE: "true"
86+
STATE: "success"

‎.github/workflows/detect-conflicts.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Conflict detector"
2+
on:
3+
push:
4+
pull_request_target:
5+
types: [synchronize]
6+
7+
jobs:
8+
main:
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check if PRs have merge conflicts
15+
uses: eps1lon/actions-label-merge-conflict@v3
16+
with:
17+
dirtyLabel: "conflicts"
18+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
19+
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
GITHUB_CONTEXT: ${{ toJson(github) }}
2929
run: echo "$GITHUB_CONTEXT"
30-
- uses: tiangolo/issue-manager@0.5.1
30+
- uses: tiangolo/issue-manager@0.6.0
3131
with:
3232
token: ${{ secrets.GITHUB_TOKEN }}
3333
config: >
@@ -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/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/labeler@v5
19+
- uses: actions/labeler@v6
2020
if: ${{ github.event.action != 'labeled' && github.event.action != 'unlabeled' }}
2121
- run: echo "Done adding labels"
2222
# Run this after labeler applied labels

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v5
2626
- name: Set up Python
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.11"
3030
- name: Install build dependencies
@@ -34,4 +34,4 @@ jobs:
3434
TIANGOLO_BUILD_PACKAGE: ${{ matrix.package }}
3535
run: python -m build
3636
- name: Publish
37-
uses: pypa/gh-action-pypi-publish@v1.12.4
37+
uses: pypa/gh-action-pypi-publish@v1.13.0

‎.github/workflows/smokeshow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v5
20-
- uses: actions/setup-python@v5
20+
- uses: actions/setup-python@v6
2121
with:
2222
python-version: '3.9'
2323
- name: Setup uv
24-
uses: astral-sh/setup-uv@v6
24+
uses: astral-sh/setup-uv@v7
2525
with:
2626
version: "0.4.15"
2727
enable-cache: true
2828
cache-dependency-glob: |
2929
requirements**.txt
3030
pyproject.toml
3131
- run: uv pip install -r requirements-github-actions.txt
32-
- uses: actions/download-artifact@v5
32+
- uses: actions/download-artifact@v6
3333
with:
3434
name: coverage-html
3535
path: htmlcov

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: echo "$GITHUB_CONTEXT"
2525
- uses: actions/checkout@v5
2626
- name: Set up Python
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.10"
3030
- name: Install build dependencies

‎.github/workflows/test.yml‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,42 @@ jobs:
2525
test:
2626
strategy:
2727
matrix:
28-
os: [ ubuntu-latest ]
29-
python-version:
30-
- "3.8"
31-
- "3.9"
32-
- "3.10"
33-
- "3.11"
34-
- "3.12"
35-
- "3.13"
28+
os: [ ubuntu-latest, windows-latest, macos-latest ]
29+
python-version: [ "3.14" ]
3630
pydantic-version:
37-
- pydantic-v1
3831
- pydantic-v2
32+
include:
33+
- os: macos-latest
34+
python-version: "3.8"
35+
pydantic-version: pydantic-v1
36+
- os: windows-latest
37+
python-version: "3.9"
38+
pydantic-version: pydantic-v2
39+
- os: ubuntu-latest
40+
python-version: "3.10"
41+
pydantic-version: pydantic-v1
42+
- os: macos-latest
43+
python-version: "3.11"
44+
pydantic-version: pydantic-v2
45+
- os: windows-latest
46+
python-version: "3.12"
47+
pydantic-version: pydantic-v1
48+
- os: ubuntu-latest
49+
python-version: "3.13"
50+
pydantic-version: pydantic-v1
51+
- os: macos-latest
52+
python-version: "3.13"
53+
pydantic-version: pydantic-v2
3954
fail-fast: false
4055
runs-on: ${{ matrix.os }}
4156
steps:
4257
- uses: actions/checkout@v5
4358
- name: Set up Python
44-
uses: actions/setup-python@v5
59+
uses: actions/setup-python@v6
4560
with:
4661
python-version: ${{ matrix.python-version }}
4762
- name: Setup uv
48-
uses: astral-sh/setup-uv@v6
63+
uses: astral-sh/setup-uv@v7
4964
with:
5065
version: "0.4.15"
5166
enable-cache: true
@@ -76,9 +91,9 @@ jobs:
7691
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
7792
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
7893
- name: Store coverage files
79-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v5
8095
with:
81-
name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
96+
name: coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
8297
path: coverage
8398
include-hidden-files: true
8499

@@ -88,19 +103,19 @@ jobs:
88103
runs-on: ubuntu-latest
89104
steps:
90105
- uses: actions/checkout@v5
91-
- uses: actions/setup-python@v5
106+
- uses: actions/setup-python@v6
92107
with:
93108
python-version: '3.13'
94109
- name: Setup uv
95-
uses: astral-sh/setup-uv@v6
110+
uses: astral-sh/setup-uv@v7
96111
with:
97112
version: "0.4.15"
98113
enable-cache: true
99114
cache-dependency-glob: |
100115
requirements**.txt
101116
pyproject.toml
102117
- name: Get coverage files
103-
uses: actions/download-artifact@v5
118+
uses: actions/download-artifact@v6
104119
with:
105120
pattern: coverage-*
106121
path: coverage
@@ -112,7 +127,7 @@ jobs:
112127
- run: coverage report
113128
- run: coverage html --title "Coverage for ${{ github.sha }}"
114129
- name: Store coverage HTML
115-
uses: actions/upload-artifact@v4
130+
uses: actions/upload-artifact@v5
116131
with:
117132
name: coverage-html
118133
path: htmlcov

‎.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.12.10
17+
rev: v0.14.2
1818
hooks:
1919
- id: ruff
2020
args:

0 commit comments

Comments
 (0)