summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@users.noreply.github.com>2020-02-13 12:01:44 +0000
committerGitHub <noreply@github.com>2020-02-13 12:01:44 +0000
commit853deb553eec5d05f7ead8d193011bcd61809e47 (patch)
tree8d956b44c883e6acbc9cfc26b51b5f794d2760ac
parent320b0e6ce9fdbdc6e740d678db29ab60a3e6a778 (diff)
downloadtox-git-853deb553eec5d05f7ead8d193011bcd61809e47.tar.gz
Avoid incompatible six (#1519)
Avoids problem introduced by newer virtualenv which broke installation of tox on systems that already had a six version >1.0 installed but which was older than minimal needed by tox.
-rw-r--r--docs/changelog/1519.bugfix.rst2
-rw-r--r--setup.cfg2
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/changelog/1519.bugfix.rst b/docs/changelog/1519.bugfix.rst
new file mode 100644
index 00000000..5817382e
--- /dev/null
+++ b/docs/changelog/1519.bugfix.rst
@@ -0,0 +1,2 @@
+Bump minimal six version needed to avoid using one incompatible with newer
+virtualenv. - by :user:`ssbarnea`
diff --git a/setup.cfg b/setup.cfg
index 9977fc83..5f0efae2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,7 +43,7 @@ install_requires =
packaging >= 14
pluggy >= 0.12.0, <1
py >= 1.4.17, <2
- six >= 1.0.0, <2
+ six >= 1.14.0, <2 # required when virtualenv>=20
virtualenv >= 16.0.0
toml >=0.9.4
filelock >= 3.0.0, <4