From: Oleg Broytman <phd@phdru.name>
Date: Fri, 15 Jan 2021 21:17:38 +0000 (+0300)
Subject: Tests,CI: Upgrade `tox`
X-Git-Tag: 0.3.0~10
X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=commitdiff_plain;h=126ddea071aac701d5b466685992995cbecad44c

Tests,CI: Upgrade `tox`

Prepare for `tox.ini` refactoring.
Stop running tests with Python 3.4 - `tox` 3.15 doesn't support it.
---

diff --git a/.travis.yml b/.travis.yml
index 65f5739..3a81d9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,6 @@ matrix:
   include:
   - python: "2.7"
     env: TOXENV=py27
-  - python: "3.4"
-    env: TOXENV=py34
   - python: "3.5"
     env: TOXENV=py35
   - python: "3.6"
@@ -34,8 +32,6 @@ matrix:
     env: TOXENV=py39
   - python: "2.7"
     env: TOXENV=py27-postgres
-  - python: "3.4"
-    env: TOXENV=py34-postgres
   - python: "3.5"
     env: TOXENV=py35-postgres
   - python: "3.6"
@@ -48,8 +44,6 @@ matrix:
     env: TOXENV=py39-postgres
   - python: "2.7"
     env: TOXENV=py27-sqlite
-  - python: "3.4"
-    env: TOXENV=py34-sqlite
   - python: "3.5"
     env: TOXENV=py35-sqlite
   - python: "3.6"
@@ -66,7 +60,7 @@ matrix:
     env: TOXENV=py39-flake8
 
 install:
-  - travis_retry pip install --upgrade "pip<21" "setuptools<44" tox ppu
+  - travis_retry pip install --upgrade "pip<21" "setuptools<44" "tox>=3.15" ppu
 
 script:
   - tox
diff --git a/appveyor.yml b/appveyor.yml
index 5c904d7..420ed1d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -103,7 +103,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - "python -m pip install --upgrade \"pip<21\" \"setuptools<44\""
-  - "pip install --upgrade \"tox<3.1\" ppu"
+  - "pip install --upgrade \"tox>=3.15\" ppu"
   - "pip --version"
 
 # No build step - we don't have C extensions
diff --git a/devscripts/requirements/requirements_tox.txt b/devscripts/requirements/requirements_tox.txt
index 8c9b6ed..8b5960b 100644
--- a/devscripts/requirements/requirements_tox.txt
+++ b/devscripts/requirements/requirements_tox.txt
@@ -1 +1 @@
-tox >= 2.0, < 3.1
+tox >= 3.15
diff --git a/tox.ini b/tox.ini
index 5502cbe..8a4b1e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 2.0
+minversion = 3.15
 envlist = py27,py3{4,5,6,7,8,9}{,-sqlite},py{27,39}-flake8
 
 # Base test environment settings