Upgrade django-template tox

developersociety · May 9, 2024 · 1f7159c · 1f7159c
1 parent cfa5bc2
commit 1f7159c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,8 +49,9 @@ jobs:
           PGUSER: postgres
           PGPASSWORD: password
           TOX_TESTENV_PASSENV: "TOX_TESTENV_PASSENV PG*"
+          TOX_OVERRIDE: "testenv.pass_env=TOX_TESTENV_PASSENV,PG*"
         run: |
-          pip install $(grep "^tox==" requirements/local.txt)
+          pip install $(grep -E "^(tox|tox-uv)==" requirements/local.txt)
           tox -e ${{ matrix.testenv }}
     services:
       postgres:

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -1,3 +1,4 @@
 -r testing.txt
 
-tox==3.28.0
+tox==4.14.2
+tox-uv==1.7.0
diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,13 @@
 [tox]
 envlist = django, django-multilingual, geodjango
-skipsdist = true
+no_package = true
 
 [testenv]
 basepython = python3.12
-envdir = {toxworkdir}/py312
 deps =
     -rrequirements/testing.txt
 changedir = {envtmpdir}
-whitelist_externals =
+allowlist_externals =
     bash
 passenv =
     GDAL_LIBRARY_PATH
@@ -17,14 +16,14 @@ passenv =
 [testenv:django]
 commands =
     cookiecutter --no-input {toxinidir}
-    bash -c "rm {envdir}/.gitignore && cd projectname && tox"
+    bash -c "cd projectname && tox"
 
 [testenv:django-multilingual]
 commands =
     cookiecutter --no-input {toxinidir} multilingual=y
-    bash -c "rm {envdir}/.gitignore && cd projectname && tox"
+    bash -c "cd projectname && tox"
 
 [testenv:geodjango]
 commands =
     cookiecutter --no-input {toxinidir} geodjango=y
-    bash -c "rm {envdir}/.gitignore && cd projectname && tox"
+    bash -c "cd projectname && tox"