Skip to content

Commit f8e23eb

Browse files
authored
Merge branch 'master' into refactor-status-code
2 parents ee25ede + 4d5b0a0 commit f8e23eb

File tree

7 files changed

+45
-6
lines changed

7 files changed

+45
-6
lines changed

.github/workflows/generate-client.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ jobs:
1212
contents: write
1313
runs-on: ubuntu-latest
1414
steps:
15+
# For PRs from forks
1516
- uses: actions/checkout@v4
17+
# For PRs from the same repo
18+
- uses: actions/checkout@v4
19+
if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
1620
with:
1721
ref: ${{ github.head_ref }}
1822
token: ${{ secrets.FULL_STACK_FASTAPI_TEMPLATE_REPO_TOKEN }}
@@ -35,10 +39,19 @@ jobs:
3539
- run: uv run bash scripts/generate-client.sh
3640
env:
3741
VIRTUAL_ENV: backend/.venv
38-
- name: Commit changes
42+
- name: Add changes to git
3943
run: |
4044
git config --local user.email "[email protected]"
4145
git config --local user.name "github-actions"
4246
git add frontend/src/client
47+
# Same repo PRs
48+
- name: Push changes
49+
if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
50+
run: |
4351
git diff --staged --quiet || git commit -m "✨ Autogenerate frontend client"
4452
git push
53+
# Fork PRs
54+
- name: Check changes
55+
if: ( github.event_name == 'pull_request' && github.secret_source != 'Actions' )
56+
run: |
57+
git diff --staged --quiet || (echo "Changes detected in generated client, run scripts/generate-client.sh and commit the changes" && exit 1)

.github/workflows/issue-manager.yml

Lines changed: 1 addition & 1 deletion
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/[email protected].0
30+
- uses: tiangolo/[email protected].1
3131
with:
3232
token: ${{ secrets.GITHUB_TOKEN }}
3333
config: >

.pre-commit-config.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ repos:
1010
args:
1111
- --unsafe
1212
- id: end-of-file-fixer
13-
exclude: ^frontend/src/client/.*
13+
exclude: |
14+
(?x)^(
15+
frontend/src/client/.*|
16+
backend/app/email-templates/build/.*
17+
)$
1418
- id: trailing-whitespace
1519
exclude: ^frontend/src/client/.*
1620
- repo: https://github.com/charliermarsh/ruff-pre-commit

backend/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM python:3.10
22

3+
ENV PYTHONUNBUFFERED=1
4+
35
WORKDIR /app/
46

57
# Install uv

backend/app/core/db.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def init_db(session: Session) -> None:
1818
# the tables un-commenting the next lines
1919
# from sqlmodel import SQLModel
2020

21-
# from app.core.engine import engine
2221
# This works because the models are already imported and registered from app.models
2322
# SQLModel.metadata.create_all(engine)
2423

copier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ _exclude:
9797
_answers_file: .copier/.copier-answers.yml
9898

9999
_tasks:
100-
- "python .copier/update_dotenv.py"
100+
- ["{{ _copier_python }}", .copier/update_dotenv.py]

release-notes.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,27 @@
22

33
## Latest Changes
44

5-
* 👷 Do not sync labels as it overrides manually added labels. PR [#1307](https://github.com/fastapi/full-stack-fastapi-template/pull/1307) by [@tiangolo](https://github.com/tiangolo).
5+
### Refactors
6+
7+
* 🔧 Add `ENV PYTHONUNBUFFERED=1` to log output directly to Docker. PR [#1378](https://github.com/fastapi/full-stack-fastapi-template/pull/1378) by [@tiangolo](https://github.com/tiangolo).
8+
* 💡 Remove unnecessary comment. PR [#1260](https://github.com/fastapi/full-stack-fastapi-template/pull/1260) by [@sebhani](https://github.com/sebhani).
9+
10+
### Internal
11+
12+
* 👷 Update pre-commit end-of-file-fixer hook to exclude email-templates. PR [#1296](https://github.com/fastapi/full-stack-fastapi-template/pull/1296) by [@goabonga](https://github.com/goabonga).
13+
* ⬆ Bump tiangolo/issue-manager from 0.5.0 to 0.5.1. PR [#1332](https://github.com/fastapi/full-stack-fastapi-template/pull/1332) by [@dependabot[bot]](https://github.com/apps/dependabot).
14+
* 🔧 Run task by the same Python environment used to run Copier. PR [#1157](https://github.com/fastapi/full-stack-fastapi-template/pull/1157) by [@waketzheng](https://github.com/waketzheng).
15+
* 👷 Tweak generate client to error out if there are errors. PR [#1377](https://github.com/fastapi/full-stack-fastapi-template/pull/1377) by [@tiangolo](https://github.com/tiangolo).
16+
* 👷 Generate and commit client only on same repo PRs, on forks, show the error. PR [#1376](https://github.com/fastapi/full-stack-fastapi-template/pull/1376) by [@tiangolo](https://github.com/tiangolo).
17+
18+
## 0.7.1
19+
20+
### Highlights
21+
22+
* Migrate from Poetry to [`uv`](https://github.com/astral-sh/uv).
23+
* Simplifications and improvements for Docker Compose files, Traefik Dockerfiles.
24+
* Make the API use its own domain `api.example.com` and the frontend use `dashboard.example.com`. This would make it easier to deploy them separately if you needed that.
25+
* The backend and frontend on Docker Compose now listen on the same port as the local development servers, this way you can stop the Docker Compose services and run the local development servers without changing the frontend configuration.
626

727
### Features
828

@@ -34,6 +54,7 @@
3454

3555
### Internal
3656

57+
* 👷 Do not sync labels as it overrides manually added labels. PR [#1307](https://github.com/fastapi/full-stack-fastapi-template/pull/1307) by [@tiangolo](https://github.com/tiangolo).
3758
* 👷 Use uv cache on GitHub Actions. PR [#1366](https://github.com/fastapi/full-stack-fastapi-template/pull/1366) by [@tiangolo](https://github.com/tiangolo).
3859
* 👷 Update GitHub Actions format. PR [#1363](https://github.com/fastapi/full-stack-fastapi-template/pull/1363) by [@tiangolo](https://github.com/tiangolo).
3960
* 👷 Use `uv` for Python env to generate client. PR [#1362](https://github.com/fastapi/full-stack-fastapi-template/pull/1362) by [@tiangolo](https://github.com/tiangolo).

0 commit comments

Comments
 (0)