Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to uv #555

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
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
16 changes: 5 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
needs: [ ruff ]
strategy:
matrix:
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13]
django-version: [4.2, 5.0, 5.1, "main"]
exclude:
# Django 5.0
Expand Down Expand Up @@ -83,16 +83,10 @@ jobs:
needs: [ tests_matrix ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: 'pip'
cache-dependency-path: requirements-dev.txt
- name: Build package
run: |
python -m pip install -r requirements-dev.txt
make build

- name: Install uv
uses: astral-sh/setup-uv@v3
- name: Build
run: make build

tests:
if: always()
Expand Down
35 changes: 30 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,35 @@
*.pyc
__pycache__

# Editors
.vscode/
.idea/

# Local development
.python-version
.envrc
.venv
uv.lock

# Testing
.coverage*
.tox/

# Vagrant
.vagrant/

# Mac/OSX
.DS_Store

# Windows
Thumbs.db

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# Distribution / packaging
*.egg-info
docs/_build/
.coverage*
dist/
.python-version
.tox/
build/
build-check-description/
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ endif

.PHONY: build
build:
python -m build
twine check dist/*
check-manifest
pyroma .
check-wheel-contents dist
uv build
uvx twine check dist/*
uvx check-manifest
uvx pyroma .
uvx check-wheel-contents dist

.PHONY: publish
publish: porcelain branch docs build
Expand Down
15 changes: 13 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = ["setuptools>=64"]
requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
authors = [
Expand Down Expand Up @@ -88,3 +88,14 @@ package = ["src/django_marina", "*/django_marina/src/django_marina"]
[tool.coverage.report]
show_missing = true
skip_covered = true

[dependency-groups]
dev = [
"check-manifest>=0.50",
"check-wheel-contents>=0.6.0",
"coverage>=7.6.1",
"pyroma>=4.2",
"ruff>=0.7.1",
"tox-uv>=1.13.1",
"twine>=5.1.1",
]
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ envlist =
py310-{4.2,5.0,5.1,main},
py311-{4.2,5.0,5.1,main},
py312-{4.2,5.0,5.1,main},
py313-{4.2,5.0,5.1,main},
docs,
ruff,

Expand All @@ -16,6 +17,7 @@ basepython =
py310: python3.10
py311: python3.11
py312: python3.12
py313: python3.13
usedevelop = true
pip_pre = true
setenv =
Expand Down