From 358b837eb639c400a3f7d55345081a7cf8b2d53d Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 09:47:16 +0100 Subject: [PATCH 1/8] Use tox-uv --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index d79b523..c397992 100644 --- a/tox.ini +++ b/tox.ini @@ -30,8 +30,9 @@ deps = 5.0: Django==5.0.* 5.1: Django==5.1.* main: https://github.com/django/django/archive/main.tar.gz - -r{toxinidir}/requirements-test.txt - +extras = + dev + [testenv:ruff] basepython = python3.11 deps = ruff From 5e1d9ea9b94644f3e0ae8e583aa38dc39717cdb3 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 09:54:27 +0100 Subject: [PATCH 2/8] Remove obsolete files --- requirements-dev.txt | 8 -------- requirements-test.txt | 3 --- 2 files changed, 11 deletions(-) delete mode 100644 requirements-dev.txt delete mode 100644 requirements-test.txt diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index f084732..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,8 +0,0 @@ --r requirements-test.txt --r docs/requirements.txt -twine==5.1.1 -build==1.2.2.post1 -setuptools==75.6.0 -check-manifest==0.50 -pyroma==4.2 -check-wheel-contents==0.6.0 diff --git a/requirements-test.txt b/requirements-test.txt deleted file mode 100644 index c360908..0000000 --- a/requirements-test.txt +++ /dev/null @@ -1,3 +0,0 @@ -tox==4.23.2 -coverage==7.6.1 -ruff==0.8.0 From 1aac5a5e2d67c58198deebb2dcb4daa3a6f2feee Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 10:51:31 +0100 Subject: [PATCH 3/8] GitHub Actions on uv --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 40c0376..d40c76b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,13 +43,16 @@ jobs: - uses: actions/checkout@v4 - name: Update repositories run: sudo apt-get update + - name: Install the latest version of uv and set the python version + uses: astral-sh/setup-uv@v4 + with: + python-version: ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' cache-dependency-path: requirements-test.txt - - run: python -m pip install -r requirements-test.txt - run: python -m pip install -U Django==${{ matrix.django-version }} if: matrix.django-version != 'main' - run: python -m pip install -U https://github.com/django/django/archive/master.tar.gz From 112b36ebb3a916653cdf0e80e197175505d92542 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 15:58:20 +0100 Subject: [PATCH 4/8] Fixing --- .github/workflows/test.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d40c76b..98cfe30 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,19 +47,14 @@ jobs: uses: astral-sh/setup-uv@v4 with: python-version: ${{ matrix.python-version }} - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: requirements-test.txt - - run: python -m pip install -U Django==${{ matrix.django-version }} + - run: uv python install + - run: uv sync--all-extras --dev + - run: uv pip install -U "Django==${{ matrix.django-version }}"" if: matrix.django-version != 'main' - - run: python -m pip install -U https://github.com/django/django/archive/master.tar.gz + - run: uv pip install -U https://github.com/django/django/archive/master.tar.gz if: matrix.django-version == 'main' - - run: python -m pip install -e . - - run: coverage run manage.py test - - run: python -m pip install -U coveralls + - run: uvx coverage run manage.py test + - run: uv pip install -U coveralls - name: Upload coveralls (parallel) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9d060fe6ff61f1d5467202e68b58d6b49c0d060f Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 16:02:32 +0100 Subject: [PATCH 5/8] Fixing --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 98cfe30..7f76da4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - run: uv python install - - run: uv sync--all-extras --dev + - run: uv sync --all-extras --dev - run: uv pip install -U "Django==${{ matrix.django-version }}"" if: matrix.django-version != 'main' - run: uv pip install -U https://github.com/django/django/archive/master.tar.gz From 15efdeb243e72868a3510e3160d53d4ba091be13 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 16:05:36 +0100 Subject: [PATCH 6/8] Fixing --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f76da4..51b9cbe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: python-version: ${{ matrix.python-version }} - run: uv python install - run: uv sync --all-extras --dev - - run: uv pip install -U "Django==${{ matrix.django-version }}"" + - run: uv pip install -U "Django==${{ matrix.django-version }}" if: matrix.django-version != 'main' - run: uv pip install -U https://github.com/django/django/archive/master.tar.gz if: matrix.django-version == 'main' From 5896176a9a44be6661e8122b1beee7031c9839e5 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 16:17:09 +0100 Subject: [PATCH 7/8] Fixing --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d259a9b..b076f2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,7 +93,7 @@ skip_covered = true dev = [ "check-manifest>=0.50", "check-wheel-contents>=0.6.0", - "coverage>=7.6.1", + "coverage[toml]>=7.6.1", "pyroma>=4.2", "ruff>=0.7.1", "tox-uv>=1.13.1", From 7b88fdac4bc7875434559a294e9efbaacbc0920b Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 29 Nov 2024 16:19:57 +0100 Subject: [PATCH 8/8] Fixing --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51b9cbe..a7da6be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: if: matrix.django-version != 'main' - run: uv pip install -U https://github.com/django/django/archive/master.tar.gz if: matrix.django-version == 'main' - - run: uvx coverage run manage.py test + - run: coverage run manage.py test - run: uv pip install -U coveralls - name: Upload coveralls (parallel) env: