From a03a0a5ea8e4a3299c02f318179001a8092a728c Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 13 Jan 2023 12:20:01 +0000 Subject: [PATCH] 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 Signed-off-by: Stephen Finucane --- tox.ini | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 863d2eb5..b7bc44e9 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,41} -skipsdist = true -ignore_basepython_conflict = true [testenv] -basepython = python3 +skip_install = true deps = -r{toxinidir}/requirements-test.txt django32: django~=3.2.0 -- 2.47.3