From: Stephen Finucane <stephen@that.guru>
Date: Fri, 13 Jan 2023 12:20:01 +0000 (+0000)
Subject: Additional updates for compatibility with tox 4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d01c81d0d76c7e1cfcb5dbf8b0d59b6da1c6938;p=thirdparty%2Fpatchwork.git

Additional updates for compatibility with tox 4

'[tox] skipsdist' behaves differently in tox 4 [1]. In addition, setting
'[testenv] basepython' with '[tox] ignore_basepython_conflict' has been
the cause of a few tox 4 bugs (most since fixed, thankfully) and might
be deprecated [2]. Remove it since we don't need it in any of our
environments.

[1] https://github.com/tox-dev/tox/issues/2730
[2] https://github.com/tox-dev/tox/issues/2846

Conflicts:
	tox.ini

NOTE(stephenfin): Conflicts are due to lack of support for Django 4.1.

Signed-off-by: Stephen Finucane <stephen@that.guru>
(cherry picked from commit a03a0a5ea8e4a3299c02f318179001a8092a728c)
---

diff --git a/tox.ini b/tox.ini
index 5be797c1..eaaa0ee4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,9 @@
 [tox]
 minversion = 3.2
 envlist = pep8,docs,py{37,38,39}-django32,py{38,39,310}-django{40}
-skipsdist = true
-ignore_basepython_conflict = true
 
 [testenv]
-basepython = python3
+skip_install = true
 deps =
     -r{toxinidir}/requirements-test.txt
     django32: django~=3.2.0