Skip to content

Commit 86d33b8

Browse files
authored
Merge pull request #135 from cantabular/pin-requirements
Pin requirements
2 parents f47d7c9 + bec9635 commit 86d33b8

File tree

4 files changed

+548
-12
lines changed

4 files changed

+548
-12
lines changed

.github/workflows/ci-build.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python: ['3.10', '3.11', '3.12', '3.13', '3.14']
14+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
1515

1616
steps:
1717
- name: Checkout code
@@ -20,11 +20,13 @@ jobs:
2020
- name: Setup Python
2121
uses: actions/setup-python@v6
2222
with:
23-
python-version: ${{ matrix.python }}
23+
python-version: ${{ matrix.python-version }}
2424

25-
- name: Install package
26-
run: |
27-
pip install .[dev]
25+
- name: Setup uv
26+
uses: astral-sh/setup-uv@ed21f2f24f8dd64503750218de024bcf64c7250a # v7.1.5
27+
28+
- name: Install packages
29+
run: uv sync --frozen
2830

2931
- name: Check formatting
3032
run: |
@@ -35,4 +37,4 @@ jobs:
3537
make check-fix
3638
3739
- name: Run tests
38-
run: pytest
40+
run: make test

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
RUN := uv run
2+
13
test:
2-
@pytest
4+
@$(RUN) pytest
35

46
fix:
5-
@ruff check --fix
7+
@$(RUN) ruff check --fix
68

79
check-fix:
8-
@ruff check
10+
@$(RUN) ruff check
911

1012
format:
11-
@ruff format
13+
@$(RUN) ruff format
1214

1315
check-format:
14-
@ruff format --check
16+
@$(RUN) ruff format --check
1517

1618
.PHONY: test fix check-fix format check-format

pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ dependencies = [
2828
"sqlalchemy>=2,<3",
2929
"alembic",
3030
]
31+
requires-python = ">=3.10"
3132

32-
[project.optional-dependencies]
33+
[dependency-groups]
3334
dev = [
3435
"ruff",
3536
"pytest",
@@ -42,3 +43,6 @@ line-length = 88
4243
[tool.setuptools.packages.find]
4344
where = ["."] # Or wherever your 'scraperwiki' package folder is located
4445
include = ["scraperwiki*"]
46+
47+
[tool.uv]
48+
required-version = ">=0.9"

0 commit comments

Comments
 (0)