Skip to content

Commit

Permalink
Merge pull request #151 from jazzband/uv-0.4-ing
Browse files Browse the repository at this point in the history
using uv-0.5.x
  • Loading branch information
shimizukawa authored Nov 13, 2024
2 parents b385774 + c926405 commit d3c9b37
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 1,036 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Build package
run: |
uvx --from build pyproject-build --installer uv
uv build
uvx twine check dist/*
- name: Upload packages to Jazzband
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,19 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: astral-sh/setup-uv@v3
with:
python-version: ${{ matrix.python-version }}
enable-cache: true
cache-dependency-glob: "pyproject.toml"
cache-suffix: ${{ matrix.python-version }}

- uses: actions/cache@v4
with:
path: ~/.cache/pip
key:
${{ matrix.python-version }}-pip-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
${{ matrix.python-version }}-pip-
- name: Install dependencies
run: |
curl -LsSf https://astral.sh/uv/install.sh | sh
uv sync
- name: Install Python
run: uv python install ${{ matrix.python-version }}
env:
UV_PYTHON_PREFERENCE: only-managed

- name: Tox tests
run: |
.venv/bin/tox -v
run: uv run --only-dev tox -v
env:
DJANGO: ${{ matrix.django-version }}
TEST_WITH_POSTGRES: 1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ coverage.xml
**/.env
examples/**/migrations/*
.idea/
uv.lock
2 changes: 1 addition & 1 deletion doc/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Build package

Use build::

$ python -m build
$ uv build


Releasing
Expand Down
32 changes: 15 additions & 17 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[build-system]
requires = ["setuptools>=64", "setuptools_scm>=8"]
build-backend = "setuptools.build_meta"

[project]
name = "django-redshift-backend"
dynamic = ["version"]
Expand Down Expand Up @@ -49,13 +45,28 @@ psycopg2-binary = [
"psycopg2-binary",
]

[dependency-groups]
dev = [
"setuptools>=73.0.1",
"setuptools-scm>=8.1.0",
"wheel>=0.44.0",
"tox-uv>=1.11.2",
"tox-gh-actions>=3.2.0",
"ruff>=0.6.2",
"twine>=5.1.1",
]

[project.urls]
Documentation = "https://django-redshift-backend.readthedocs.io/"
Homepage = "https://github.com/jazzband/django-redshift-backend"
"Release notes" = "https://django-redshift-backend.readthedocs.io/en/master/changes.html"
Source = "https://github.com/jazzband/django-redshift-backend"
Tracker = "https://github.com/jazzband/django-redshift-backend/issues"

[build-system]
requires = ["setuptools>=64", "setuptools_scm>=8"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
include-package-data = true

Expand All @@ -67,18 +78,5 @@ local_scheme = "no-local-version"
[tool.ruff]
exclude = ["django_redshift_backend/_vendor"]

[tool.uv]
dev-dependencies = [
"setuptools>=73.0.1",
"wheel>=0.44.0",
"setuptools-scm>=8.1.0",
"tox-uv>=1.11.2",
"build>=1.2.1",
"twine>=5.1.1",
"django-redshift-backend",
"ruff>=0.6.2",
"tox-gh-actions>=3.2.0",
]

[tool.uv.sources]
django-redshift-backend = { workspace = true }
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,10 @@ commands=
ruff format django_redshift_backend

[testenv:check]
deps =
twine
build
deps = uv
commands =
python -m build
twine check dist/*
uv build
uvx twine check dist/*

[flake8]
max-line-length=120
Expand Down
996 changes: 0 additions & 996 deletions uv.lock

This file was deleted.

0 comments on commit d3c9b37

Please sign in to comment.