Skip to content

Commit df7da5a

Browse files
committed
Merge remote-tracking branch 'origin/ci-upgrade-actions' into slim
2 parents 09306ae + 66e8c25 commit df7da5a

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ jobs:
4747
matrix:
4848
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
4949
steps:
50-
- uses: actions/cache@v4
50+
- uses: actions/cache@v5
5151
with:
5252
path: ~/.cache/pip
5353
key: ${{ runner.os }}-pip-${{ hashFiles('**/uv.lock') }}
5454
restore-keys: |
5555
${{ runner.os }}-pip-
56-
- uses: actions/checkout@v4
57-
- uses: actions/setup-python@v5
56+
- uses: actions/checkout@v6
57+
- uses: actions/setup-python@v6
5858
with:
5959
python-version: ${{ matrix.python-version }}
60-
- uses: astral-sh/setup-uv@v6
60+
- uses: astral-sh/setup-uv@v7
6161
- name: Install ODBC driver
6262
run: |
6363
curl -sSL -O https://packages.microsoft.com/config/ubuntu/$(grep VERSION_ID /etc/os-release | cut -d '"' -f 2)/packages-microsoft-prod.deb
@@ -68,9 +68,9 @@ jobs:
6868
run: make ci
6969
- name: Test FastAPI/Blacksheep Example
7070
run: |
71-
PYTHONPATH=$DEST_FASTAPI uv run pytest $PYTEST_ARGS $DEST_FASTAPI/_tests.py
72-
PYTHONPATH=$DEST_BLACKSHEEP uv run pytest $PYTEST_ARGS $DEST_BLACKSHEEP/_tests.py
73-
PYTHONPATH=$DEST_SANIC uv run pytest $PYTEST_ARGS $DEST_SANIC/_tests.py
71+
PYTHONPATH=$DEST_FASTAPI uv run --frozen pytest $PYTEST_ARGS $DEST_FASTAPI/_tests.py
72+
PYTHONPATH=$DEST_BLACKSHEEP uv run --frozen pytest $PYTEST_ARGS $DEST_BLACKSHEEP/_tests.py
73+
PYTHONPATH=$DEST_SANIC uv run --frozen pytest $PYTEST_ARGS $DEST_SANIC/_tests.py
7474
env:
7575
DEST_FASTAPI: examples/fastapi
7676
DEST_BLACKSHEEP: examples/blacksheep
@@ -79,8 +79,7 @@ jobs:
7979
PYTEST_ARGS: "-n auto --cov=tortoise --cov-append --cov-branch --tb=native -q"
8080
- name: Upload Coverage
8181
run: |
82-
pip3 install --upgrade coveralls
83-
coveralls --service=github
82+
uvx coveralls --service=github
8483
env:
8584
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8685
COVERALLS_FLAG_NAME: ${{ matrix.python-version }}

.github/workflows/codspeed.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
name: Run benchmarks
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-python@v5
17+
- uses: actions/checkout@v6
18+
- uses: actions/setup-python@v6
1919
with:
2020
# 3.12 is the minimum required version for profiling enabled
2121
python-version: "3.12"
2222

23-
- uses: astral-sh/setup-uv@v6
23+
- uses: astral-sh/setup-uv@v7
2424

2525
- name: Build dists
2626
run: make build
@@ -29,4 +29,4 @@ jobs:
2929
uses: CodSpeedHQ/action@v3
3030
with:
3131
token: ${{ secrets.CODSPEED_TOKEN }}
32-
run: uv run pytest tests/benchmarks --codspeed
32+
run: uv run --frozen pytest tests/benchmarks --codspeed

.github/workflows/gh-pages-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
publish:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-python@v5
10+
- uses: actions/checkout@v6
11+
- uses: actions/setup-python@v6
1212
with:
1313
python-version: "3.9"
14-
- uses: astral-sh/setup-uv@v6
14+
- uses: astral-sh/setup-uv@v7
1515
- name: Build docs
1616
run: make docs
1717
- name: Deploy release docs

.github/workflows/gh-pages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
publish:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
12-
- uses: actions/setup-python@v5
11+
- uses: actions/checkout@v6
12+
- uses: actions/setup-python@v6
1313
with:
1414
python-version: "3.9"
15-
- uses: astral-sh/setup-uv@v6
15+
- uses: astral-sh/setup-uv@v7
1616
- name: Build docs
1717
run: make docs
1818
- name: Deploy latest docs

.github/workflows/pypi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
publish:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-python@v5
10+
- uses: actions/checkout@v6
11+
- uses: actions/setup-python@v6
1212
with:
1313
python-version: '3.9'
14-
- uses: astral-sh/setup-uv@v6
14+
- uses: astral-sh/setup-uv@v7
1515
- name: Build dists
1616
run: make build
1717
- name: Pypi Publish

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers = [
3232
"Framework :: AsyncIO",
3333
"Topic :: Software Development :: Libraries :: Python Modules",
3434
"Topic :: Database",
35+
"Typing :: Typed",
3536
"Operating System :: POSIX",
3637
"Operating System :: MacOS :: MacOS X",
3738
"Operating System :: Microsoft :: Windows",
@@ -120,7 +121,7 @@ build-backend = "pdm.backend"
120121
version = {source="file", path="tortoise/__init__.py"}
121122

122123
[tool.pdm.build]
123-
excludes = ["./**/.git", "./**/.*_cache"]
124+
excludes = ["./**/.git", "./**/.*_cache", "examples"]
124125
include = ["CHANGELOG.rst", "LICENSE", "README.rst"]
125126

126127
[tool.mypy]

0 commit comments

Comments
 (0)