Skip to content

Commit 6de51df

Browse files
committed
Merge branch 'main' into review-pr-397
2 parents c7b47c6 + cd85593 commit 6de51df

Some content is hidden

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

45 files changed

+1075
-466
lines changed

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Ruff format the entire project
22
5d60da17455607e9c8b7e7fef9940d20027894f2
3+
c222caec1009b041a3229ba26bfe8fec4dccf553

.github/workflows/linting.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ jobs:
1111
- name: Checkout Code
1212
uses: actions/checkout@v4
1313

14-
- name: Install Dependencies
15-
run: pip install ruff
14+
- name: Install uv
15+
uses: astral-sh/setup-uv@v5
16+
with:
17+
enable-cache: true
18+
cache-dependency-glob: "uv.lock"
1619

1720
- name: Code Linting
1821
if: always()
19-
run: ruff check qrcode
22+
run: uv run ruff check qrcode
2023

2124
- name: Code Formatting
2225
if: always()
23-
run: ruff format --check qrcode
26+
run: uv run ruff format --check qrcode

.github/workflows/push.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,29 @@ name: Testsuite Run
33
on: [push]
44

55
jobs:
6-
build:
6+
test:
7+
name: Test Python ${{ matrix.python-version }}
78
runs-on: ubuntu-latest
89
strategy:
9-
max-parallel: 4
10+
fail-fast: false
1011
matrix:
11-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
12+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1213

1314
steps:
1415
- uses: actions/checkout@v4
1516

16-
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v5
17+
- name: Install uv
18+
uses: astral-sh/setup-uv@v5
1819
with:
1920
python-version: ${{ matrix.python-version }}
21+
enable-cache: true
22+
cache-dependency-glob: "uv.lock"
2023

21-
- name: Install dependencies
22-
run: |
23-
pip install --disable-pip-version-check tox tox-gh-actions
24-
- name: Test with tox
25-
run: tox
24+
- name: Test with pil
25+
run: uv run --extra pil --group dev pytest
26+
27+
- name: Test with png
28+
run: uv run --extra png --group dev pytest
29+
30+
- name: Test with none
31+
run: uv run --group dev pytest

.github/workflows/python-app.yml

Lines changed: 0 additions & 77 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ cov.xml
99
dist/
1010
htmlcov/
1111
poetry.lock
12+
uv.lock
1213
qrcode.egg-info/

0 commit comments

Comments
 (0)