Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 9 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,14 @@ jobs:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/poetry.lock') }}
restore-keys: |
${{ runner.os }}-pip-
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
run: |
pip install -U pip poetry
poetry config virtualenvs.create false
pip3 install wheel setuptools pip --upgrade
- uses: astral-sh/setup-uv@v7
- name: Run ci
run: make ci
run: uv run make ci

ci_mariadb:
runs-on: ubuntu-latest
services:
Expand All @@ -50,20 +41,10 @@ jobs:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/poetry.lock') }}
restore-keys: |
${{ runner.os }}-pip-
- uses: actions/checkout@v5
- uses: actions/setup-python@v5
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
run: |
pip install -U pip poetry
poetry config virtualenvs.create false
pip3 install wheel setuptools pip --upgrade
- uses: astral-sh/setup-uv@v7
- name: Run ci
run: make ci
run: uv run make ci
8 changes: 4 additions & 4 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-15-intel, macos-latest]
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Build wheels
Expand All @@ -25,12 +25,12 @@ jobs:
build_sdist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: abatilo/actions-poetry@v4
- uses: astral-sh/setup-uv@v7
- name: Build
run: poetry build
run: uv build
- uses: actions/upload-artifact@v4
with:
name: cibw-sdist
Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ py_warn = PYTHONDEVMODE=1
MYSQL_PASS ?= "123456"

up:
@poetry update
@uv lock --upgrade
$(MAKE) deps options=--frozen

deps:
@poetry install --all-groups
uv sync --all-groups $(options)

_style:
@ruff format $(checkfiles)
Expand All @@ -30,7 +31,7 @@ clean:
@rm -rf *.so && rm -rf build && rm -rf dist && rm -rf asyncmy/*.c && rm -rf asyncmy/*.so && rm -rf asyncmy/*.html

build: clean
@poetry build
@uv build

benchmark: deps
@python -m benchmark.run_all
Expand Down
Loading