Skip to content

Commit 252a50d

Browse files
07pepa07pepa
authored
Merge branch 'fastapi:main' into add-log-config-overides
2 parents 74093c6 + cc841c2 commit 252a50d

File tree

18 files changed

+343
-35
lines changed

18 files changed

+343
-35
lines changed

‎.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,6 +38,10 @@ 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
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
GITHUB_CONTEXT: ${{ toJson(github) }}
2626
run: echo "$GITHUB_CONTEXT"
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
# To allow latest-changes to commit to the main branch
3030
token: ${{ secrets.LATEST_CHANGES }}
@@ -34,7 +34,7 @@ jobs:
3434
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
3535
with:
3636
limit-access-to-actor: true
37-
- uses: tiangolo/[email protected].0
37+
- uses: tiangolo/[email protected].1
3838
with:
3939
token: ${{ secrets.GITHUB_TOKEN }}
4040
latest_changes_file: release-notes.md

‎.github/workflows/publish.yml‎

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

‎.github/workflows/smokeshow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ jobs:
2020
env:
2121
GITHUB_CONTEXT: ${{ toJson(github) }}
2222
run: echo "$GITHUB_CONTEXT"
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
- uses: actions/setup-python@v6
2525
with:
2626
python-version: '3.9'
2727
- name: Setup uv
28-
uses: astral-sh/setup-uv@v6
28+
uses: astral-sh/setup-uv@v7
2929
with:
3030
version: "0.4.15"
3131
enable-cache: true
3232
cache-dependency-glob: |
3333
requirements**.txt
3434
pyproject.toml
3535
- run: uv pip install -r requirements-github-actions.txt
36-
- uses: actions/download-artifact@v5
36+
- uses: actions/download-artifact@v6
3737
with:
3838
name: coverage-html
3939
path: htmlcov

‎.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: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,47 @@ env:
2626

2727
jobs:
2828
test:
29-
runs-on: ubuntu-latest
3029
strategy:
3130
matrix:
32-
python-version:
33-
- "3.8"
34-
- "3.9"
35-
- "3.10"
36-
- "3.11"
37-
- "3.12"
31+
os: [ ubuntu-latest, windows-latest, macos-latest ]
32+
python-version: ["3.14"]
33+
pydantic-version: ["v2"]
34+
include:
35+
- python-version: "3.8"
36+
pydantic-version: "v1"
37+
os: windows-latest
38+
- python-version: "3.9"
39+
pydantic-version: "v2"
40+
os: macos-latest
41+
- python-version: "3.10"
42+
pydantic-version: "v1"
43+
os: ubuntu-latest
44+
- python-version: "3.11"
45+
pydantic-version: "v2"
46+
os: windows-latest
47+
- python-version: "3.12"
48+
pydantic-version: "v1"
49+
os: macos-latest
50+
- python-version: "3.13"
51+
pydantic-version: "v1"
52+
os: ubuntu-latest
53+
- python-version: "3.13"
54+
pydantic-version: "v2"
55+
os: windows-latest
3856
fail-fast: false
57+
runs-on: ${{ matrix.os }}
3958
steps:
4059
- name: Dump GitHub context
4160
env:
4261
GITHUB_CONTEXT: ${{ toJson(github) }}
4362
run: echo "$GITHUB_CONTEXT"
44-
- uses: actions/checkout@v5
63+
- uses: actions/checkout@v6
4564
- name: Set up Python
4665
uses: actions/setup-python@v6
4766
with:
4867
python-version: ${{ matrix.python-version }}
4968
- name: Setup uv
50-
uses: astral-sh/setup-uv@v6
69+
uses: astral-sh/setup-uv@v7
5170
with:
5271
version: "0.4.15"
5372
enable-cache: true
@@ -62,18 +81,21 @@ jobs:
6281
limit-access-to-actor: true
6382
- name: Install Dependencies
6483
run: uv pip install -r requirements-tests.txt
84+
- name: Install Pydantic v1
85+
if: matrix.pydantic-version == 'v1'
86+
run: uv pip install "pydantic<2.0.0"
6587
- name: Lint
6688
run: bash scripts/lint.sh
6789
- run: mkdir coverage
6890
- name: Test
6991
run: bash scripts/test.sh
7092
env:
71-
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
72-
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
93+
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-pydantic-${{ matrix.pydantic-version }}
94+
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-pydantic-${{ matrix.pydantic-version }}
7395
- name: Store coverage files
74-
uses: actions/upload-artifact@v4
96+
uses: actions/upload-artifact@v5
7597
with:
76-
name: coverage-${{ matrix.python-version }}
98+
name: coverage-${{ runner.os }}-${{ matrix.python-version }}-pydantic-${{ matrix.pydantic-version }}
7799
path: coverage
78100
include-hidden-files: true
79101

@@ -85,20 +107,20 @@ jobs:
85107
env:
86108
GITHUB_CONTEXT: ${{ toJson(github) }}
87109
run: echo "$GITHUB_CONTEXT"
88-
- uses: actions/checkout@v5
110+
- uses: actions/checkout@v6
89111
- uses: actions/setup-python@v6
90112
with:
91113
python-version: '3.8'
92114
- name: Setup uv
93-
uses: astral-sh/setup-uv@v6
115+
uses: astral-sh/setup-uv@v7
94116
with:
95117
version: "0.4.15"
96118
enable-cache: true
97119
cache-dependency-glob: |
98120
requirements**.txt
99121
pyproject.toml
100122
- name: Get coverage files
101-
uses: actions/download-artifact@v5
123+
uses: actions/download-artifact@v6
102124
with:
103125
pattern: coverage-*
104126
path: coverage
@@ -109,7 +131,7 @@ jobs:
109131
- run: coverage report
110132
- run: coverage html --title "Coverage for ${{ github.sha }}"
111133
- name: Store coverage HTML
112-
uses: actions/upload-artifact@v4
134+
uses: actions/upload-artifact@v5
113135
with:
114136
name: coverage-html
115137
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.13.0
17+
rev: v0.14.6
1818
hooks:
1919
- id: ruff
2020
args:

‎pyproject.toml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ authors = [
77
]
88
requires-python = ">=3.8"
99
readme = "README.md"
10-
license = {text = "MIT"}
10+
license = "MIT"
11+
license-files = ["LICENSE"]
1112
classifiers = [
1213
"Intended Audience :: Information Technology",
1314
"Intended Audience :: System Administrators",
@@ -22,19 +23,20 @@ classifiers = [
2223
"Development Status :: 4 - Beta",
2324
"Framework :: FastAPI",
2425
"Intended Audience :: Developers",
25-
"License :: OSI Approved :: MIT License",
2626
"Programming Language :: Python :: 3 :: Only",
2727
"Programming Language :: Python :: 3.8",
2828
"Programming Language :: Python :: 3.9",
2929
"Programming Language :: Python :: 3.10",
3030
"Programming Language :: Python :: 3.11",
3131
"Programming Language :: Python :: 3.12",
32-
"License :: OSI Approved :: MIT License",
32+
"Programming Language :: Python :: 3.13",
33+
"Programming Language :: Python :: 3.14",
3334
]
3435
dependencies = [
3536
"typer >= 0.15.1",
3637
"uvicorn[standard] >= 0.15.0",
3738
"rich-toolkit >= 0.14.8",
39+
"tomli >= 2.0.0; python_version < '3.11'"
3840
]
3941

4042
[project.optional-dependencies]
@@ -87,6 +89,7 @@ source = [
8789
"src",
8890
"tests",
8991
]
92+
relative_files = true
9093
context = '${CONTEXT}'
9194
dynamic_context = "test_function"
9295
omit = [

‎release-notes.md‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,60 @@
22

33
## Latest Changes
44

5+
### Internal
6+
7+
* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#247](https://github.com/fastapi/fastapi-cli/pull/247) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
8+
* ⬆ Bump ruff from 0.14.5 to 0.14.6. PR [#245](https://github.com/fastapi/fastapi-cli/pull/245) by [@dependabot[bot]](https://github.com/apps/dependabot).
9+
* ⬆ Bump actions/checkout from 5 to 6. PR [#248](https://github.com/fastapi/fastapi-cli/pull/248) by [@dependabot[bot]](https://github.com/apps/dependabot).
10+
* ⬆ Bump actions/checkout from 5 to 6. PR [#244](https://github.com/fastapi/fastapi-cli/pull/244) by [@dependabot[bot]](https://github.com/apps/dependabot).
11+
* 👷 Upgrade `latest-changes` GitHub Action and pin `actions/checkout@v5`. PR [#246](https://github.com/fastapi/fastapi-cli/pull/246) by [@svlandeg](https://github.com/svlandeg).
12+
* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#243](https://github.com/fastapi/fastapi-cli/pull/243) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
13+
* ⬆ Bump ruff from 0.14.4 to 0.14.5. PR [#242](https://github.com/fastapi/fastapi-cli/pull/242) by [@dependabot[bot]](https://github.com/apps/dependabot).
14+
* ✅ Expand test matrix to include Windows and MacOS. PR [#230](https://github.com/fastapi/fastapi-cli/pull/230) by [@svlandeg](https://github.com/svlandeg).
15+
* ⬆ Bump ruff from 0.14.2 to 0.14.4. PR [#239](https://github.com/fastapi/fastapi-cli/pull/239) by [@dependabot[bot]](https://github.com/apps/dependabot).
16+
* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#238](https://github.com/fastapi/fastapi-cli/pull/238) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
17+
18+
## 0.0.16
19+
20+
### Fixes
21+
22+
* 🐛 Fix support for Pydantic v1. PR [#240](https://github.com/fastapi/fastapi-cli/pull/240) by [@patrick91](https://github.com/patrick91).
23+
24+
## 0.0.15
25+
26+
### Features
27+
28+
* ✨ Add support for reading configuration from `pyproject.toml`. PR [#236](https://github.com/fastapi/fastapi-cli/pull/236) by [@patrick91](https://github.com/patrick91).
29+
30+
You can use it in `pyproject.toml` like:
31+
32+
```toml
33+
[tool.fastapi]
34+
entrypoint = "some.importable_module:app_name"
35+
```
36+
37+
### Internal
38+
39+
* ⬆ Bump actions/upload-artifact from 4 to 5. PR [#232](https://github.com/fastapi/fastapi-cli/pull/232) by [@dependabot[bot]](https://github.com/apps/dependabot).
40+
* ⬆ Bump ruff from 0.14.1 to 0.14.2. PR [#231](https://github.com/fastapi/fastapi-cli/pull/231) by [@dependabot[bot]](https://github.com/apps/dependabot).
41+
* ⬆ Bump actions/download-artifact from 5 to 6. PR [#233](https://github.com/fastapi/fastapi-cli/pull/233) by [@dependabot[bot]](https://github.com/apps/dependabot).
42+
* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#235](https://github.com/fastapi/fastapi-cli/pull/235) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
43+
* 🔧 Add PEP-639 license metadata. PR [#234](https://github.com/fastapi/fastapi-cli/pull/234) by [@svlandeg](https://github.com/svlandeg).
44+
* ⬆ Bump astral-sh/setup-uv from 6 to 7. PR [#223](https://github.com/fastapi/fastapi-cli/pull/223) by [@dependabot[bot]](https://github.com/apps/dependabot).
45+
* ⬆ Bump ruff from 0.13.0 to 0.14.1. PR [#228](https://github.com/fastapi/fastapi-cli/pull/228) by [@dependabot[bot]](https://github.com/apps/dependabot).
46+
* 🔧 Configure reminder for `waiting` label in `issue-manager`. PR [#227](https://github.com/fastapi/fastapi-cli/pull/227) by [@YuriiMotov](https://github.com/YuriiMotov).
47+
* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#215](https://github.com/fastapi/fastapi-cli/pull/215) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
48+
49+
## 0.0.14
50+
51+
### Upgrades
52+
53+
* ⬆️ Add support for Python 3.13 and 3.14. PR [#225](https://github.com/fastapi/fastapi-cli/pull/225) by [@svlandeg](https://github.com/svlandeg).
54+
55+
### Internal
56+
57+
* ⬆ Bump tiangolo/issue-manager from 0.5.1 to 0.6.0. PR [#220](https://github.com/fastapi/fastapi-cli/pull/220) by [@dependabot[bot]](https://github.com/apps/dependabot).
58+
559
## 0.0.13
660

761
### Features

‎requirements-tests.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pytest >=4.4.0,<9.0.0
44
coverage[toml] >=6.2,<8.0
55
mypy ==1.14.1
6-
ruff ==0.13.0
6+
ruff ==0.14.6
77
# Needed explicitly by fastapi-cli-slim
88
fastapi-slim
99
uvicorn

0 commit comments

Comments
 (0)