Skip to content

Commit 7173b44

Browse files
authored
Merge branch 'main' into sqlalchemy_polymorphic_support
2 parents 0efd1bf + 8c27528 commit 7173b44

File tree

9 files changed

+37
-17
lines changed

9 files changed

+37
-17
lines changed

.github/workflows/build-docs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
- mkdocs.no-insiders.yml
4242
- .github/workflows/build-docs.yml
4343
- .github/workflows/deploy-docs.yml
44+
- data/**
4445
4546
build-docs:
4647
needs:
@@ -58,7 +59,7 @@ jobs:
5859
with:
5960
python-version: "3.11"
6061
- name: Setup uv
61-
uses: astral-sh/setup-uv@v3
62+
uses: astral-sh/setup-uv@v4
6263
with:
6364
version: "0.4.15"
6465
enable-cache: true

.github/workflows/deploy-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
python-version: "3.11"
3131
- name: Setup uv
32-
uses: astral-sh/setup-uv@v3
32+
uses: astral-sh/setup-uv@v4
3333
with:
3434
version: "0.4.15"
3535
enable-cache: true

.github/workflows/latest-changes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -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/[email protected].1
33+
- uses: tiangolo/[email protected].2
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636
latest_changes_file: docs/release-notes.md

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.9.0
37+
uses: pypa/gh-action-pypi-publish@v1.12.3

.github/workflows/smokeshow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
python-version: '3.9'
2323
- name: Setup uv
24-
uses: astral-sh/setup-uv@v3
24+
uses: astral-sh/setup-uv@v4
2525
with:
2626
version: "0.4.15"
2727
enable-cache: true

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
python-version: ${{ matrix.python-version }}
4646
- name: Setup uv
47-
uses: astral-sh/setup-uv@v3
47+
uses: astral-sh/setup-uv@v4
4848
with:
4949
version: "0.4.15"
5050
enable-cache: true
@@ -92,7 +92,7 @@ jobs:
9292
with:
9393
python-version: '3.12'
9494
- name: Setup uv
95-
uses: astral-sh/setup-uv@v3
95+
uses: astral-sh/setup-uv@v4
9696
with:
9797
version: "0.4.15"
9898
enable-cache: true

data/members.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
members:
22
- login: tiangolo
3-
- login: estebanx64
43
- login: alejsdev

docs/release-notes.md

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717

1818
### Internal
1919

20+
* ⬆ Bump pypa/gh-action-pypi-publish from 1.9.0 to 1.12.3. PR [#1240](https://github.com/fastapi/sqlmodel/pull/1240) by [@dependabot[bot]](https://github.com/apps/dependabot).
21+
* ⬆ Bump astral-sh/setup-uv from 3 to 4. PR [#1225](https://github.com/fastapi/sqlmodel/pull/1225) by [@dependabot[bot]](https://github.com/apps/dependabot).
22+
* ⬆ Bump tiangolo/latest-changes from 0.3.1 to 0.3.2. PR [#1207](https://github.com/fastapi/sqlmodel/pull/1207) by [@dependabot[bot]](https://github.com/apps/dependabot).
23+
* 🔨 Update docs previews script. PR [#1236](https://github.com/fastapi/sqlmodel/pull/1236) by [@tiangolo](https://github.com/tiangolo).
24+
* 🔧 Update build-docs filter paths. PR [#1235](https://github.com/fastapi/sqlmodel/pull/1235) by [@tiangolo](https://github.com/tiangolo).
25+
* 🔧 Update team members. PR [#1234](https://github.com/fastapi/sqlmodel/pull/1234) by [@tiangolo](https://github.com/tiangolo).
2026
* ⬆️ Upgrade markdown-include-variants to version 0.0.3. PR [#1152](https://github.com/fastapi/sqlmodel/pull/1152) by [@tiangolo](https://github.com/tiangolo).
2127
* 👷 Update issue manager workflow. PR [#1137](https://github.com/fastapi/sqlmodel/pull/1137) by [@alejsdev](https://github.com/alejsdev).
2228
* 👷 Fix smokeshow, checkout files on CI. PR [#1136](https://github.com/fastapi/sqlmodel/pull/1136) by [@tiangolo](https://github.com/tiangolo).

scripts/deploy_docs_status.py

+23-9
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
import re
33

44
from github import Github
5-
from pydantic import SecretStr
5+
from pydantic import BaseModel, SecretStr
66
from pydantic_settings import BaseSettings
77

8+
site_domain = "sqlmodel.tiangolo.com"
9+
810

911
class Settings(BaseSettings):
1012
github_repository: str
@@ -15,7 +17,12 @@ class Settings(BaseSettings):
1517
is_done: bool = False
1618

1719

18-
def main():
20+
class LinkData(BaseModel):
21+
previous_link: str
22+
preview_link: str
23+
24+
25+
def main() -> None:
1926
logging.basicConfig(level=logging.INFO)
2027
settings = Settings()
2128

@@ -60,24 +67,31 @@ def main():
6067
docs_files = [f for f in files if f.filename.startswith("docs/")]
6168

6269
deploy_url = settings.deploy_url.rstrip("/")
63-
links: list[str] = []
70+
links: list[LinkData] = []
6471
for f in docs_files:
6572
match = re.match(r"docs/(.*)", f.filename)
66-
assert match
73+
if not match:
74+
continue
6775
path = match.group(1)
6876
if path.endswith("index.md"):
69-
path = path.replace("index.md", "")
77+
use_path = path.replace("index.md", "")
7078
else:
71-
path = path.replace(".md", "/")
72-
link = f"{deploy_url}/{path}"
79+
use_path = path.replace(".md", "/")
80+
link = LinkData(
81+
previous_link=f"https://{site_domain}/{use_path}",
82+
preview_link=f"{deploy_url}/{use_path}",
83+
)
7384
links.append(link)
74-
links.sort()
85+
links.sort(key=lambda x: x.preview_link)
7586

7687
message = f"📝 Docs preview for commit {settings.commit_sha} at: {deploy_url}"
7788

7889
if links:
7990
message += "\n\n### Modified Pages\n\n"
80-
message += "\n".join([f"* {link}" for link in links])
91+
for link in links:
92+
message += f"* {link.preview_link}"
93+
message += f" - ([before]({link.previous_link}))"
94+
message += "\n"
8195

8296
print(message)
8397
use_pr.as_issue().create_comment(message)

0 commit comments

Comments
 (0)