From 274ebd8bc9739944c5b8a4add5e4a28e6ca5e545 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 25 Dec 2024 16:37:52 +0100 Subject: [PATCH] Update tox to use tox-uv --- .github/workflows/ci.yml | 2 +- tox.ini | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 771a0345..54e65fa6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - uses: astral-sh/setup-uv@v5 with: python-version: ${{ matrix.python }} - - run: uv pip install tox + - run: uv pip install tox tox-uv - run: tox -e ${{ matrix.tox }} if: ${{ ! matrix.coverage }} - run: tox -e ${{ matrix.tox }} -- --cov-report=xml diff --git a/tox.ini b/tox.ini index d6fa2663..488067ed 100644 --- a/tox.ini +++ b/tox.ini @@ -3,12 +3,12 @@ envlist = py312, docs, ruff-format, ruff-lint, mypy skipsdist = true [testenv] -allowlist_externals = poetry +runner = uv-venv-lock-runner +dependency_groups = dev setenv = DJANGO_SECRET_KEY=test-only-s3cret commands = - poetry install - poetry run python -m pytest \ + uv run pytest \ --basetemp={envtmpdir} \ --cov=comics --cov-report=term-missing \ {posargs} @@ -16,20 +16,20 @@ commands = [testenv:docs] changedir = docs commands = - python -m pip install -r requirements.txt - python -m sphinx -b html -d {envtmpdir}/doctrees . {envtmpdir}/html + uv pip install -r requirements.txt + uv run sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:ruff-format] -commands = - poetry install - poetry run python -m ruff format --check +runner = uv-venv-lock-runner +dependency_groups = dev +commands = uv run ruff format --check [testenv:ruff-lint] -commands = - poetry install - poetry run python -m ruff check +runner = uv-venv-lock-runner +dependency_groups = dev +commands = uv run ruff check [testenv:mypy] -commands = - poetry install - poetry run python -m mypy comics +runner = uv-venv-lock-runner +dependency_groups = dev +commands = uv run mypy comics