Skip to content

Commit d876108

Browse files
tiangolotiangolo
authored
Merge branch 'master' into support_literal_choices
2 parents 2a17629 + 2ece3e6 commit d876108

42 files changed

Lines changed: 257 additions & 136 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: echo "$GITHUB_CONTEXT"
5555
- uses: actions/checkout@v5
5656
- name: Set up Python
57-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5858
with:
5959
python-version: "3.11"
6060
- name: Setup uv

‎.github/workflows/conflict.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/deploy-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
rm -rf ./site
5151
mkdir ./site
52-
- uses: actions/download-artifact@v4
52+
- uses: actions/download-artifact@v5
5353
with:
5454
path: ./site/
5555
pattern: docs-site

‎.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
@@ -23,7 +23,7 @@ jobs:
2323
run: echo "$GITHUB_CONTEXT"
2424
- uses: actions/checkout@v5
2525
- name: Set up Python
26-
uses: actions/setup-python@v5
26+
uses: actions/setup-python@v6
2727
with:
2828
python-version: "3.10"
2929
# Issue ref: https://github.com/actions/setup-python/issues/436
@@ -36,4 +36,4 @@ jobs:
3636
TIANGOLO_BUILD_PACKAGE: ${{ matrix.package }}
3737
run: python -m build
3838
- name: Publish
39-
uses: pypa/gh-action-pypi-publish@v1.12.4
39+
uses: pypa/gh-action-pypi-publish@v1.13.0

‎.github/workflows/smokeshow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
GITHUB_CONTEXT: ${{ toJson(github) }}
2424
run: echo "$GITHUB_CONTEXT"
2525
- uses: actions/checkout@v5
26-
- uses: actions/setup-python@v5
26+
- uses: actions/setup-python@v6
2727
with:
2828
python-version: '3.9'
2929
- name: Setup uv
@@ -35,7 +35,7 @@ jobs:
3535
requirements**.txt
3636
pyproject.toml
3737
- run: uv pip install -r requirements-github-actions.txt
38-
- uses: actions/download-artifact@v4
38+
- uses: actions/download-artifact@v5
3939
with:
4040
name: coverage-html
4141
path: htmlcov

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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.10"
3131
# Issue ref: https://github.com/actions/setup-python/issues/436

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: echo "$GITHUB_CONTEXT"
4444
- uses: actions/checkout@v5
4545
- name: Set up Python
46-
uses: actions/setup-python@v5
46+
uses: actions/setup-python@v6
4747
with:
4848
python-version: ${{ matrix.python-version }}
4949
- name: Setup uv
@@ -82,7 +82,7 @@ jobs:
8282
GITHUB_CONTEXT: ${{ toJson(github) }}
8383
run: echo "$GITHUB_CONTEXT"
8484
- uses: actions/checkout@v5
85-
- uses: actions/setup-python@v5
85+
- uses: actions/setup-python@v6
8686
with:
8787
python-version: '3.8'
8888
- name: Setup uv
@@ -94,7 +94,7 @@ jobs:
9494
requirements**.txt
9595
pyproject.toml
9696
- name: Get coverage files
97-
uses: actions/download-artifact@v4
97+
uses: actions/download-artifact@v5
9898
with:
9999
pattern: coverage-*
100100
path: coverage

‎.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.13.0
1818
hooks:
1919
- id: ruff
2020
args:

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ Goodbye Ms. Camila. Have a good day.
318318

319319
</div>
320320

321+
**Note**: If your app only has one command, by default the command name is **omitted** in usage: `python main.py Camila`. However, when there are multiple commands, you must **explicitly include the command name**: `python main.py hello Camila`. See [One or Multiple Commands](https://typer.tiangolo.com/tutorial/commands/one-or-multiple/) for more details.
322+
321323
### Recap
322324

323325
In summary, you declare **once** the types of parameters (*CLI arguments* and *CLI options*) as function parameters.

0 commit comments

Comments
 (0)