From e3f8fe2623fc62ef06f907e13edc64fcefe0b70b Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Fri, 1 Jan 2021 20:03:19 +0300
Subject: [PATCH] Test(tox): Refactor `tox.ini`: combine environments

CI(Travis): Stop running tests with Python 3.4 -
`tox` 3.15 doesn't support it.
---
 .travis.yml                                  |  4 +-
 appveyor.yml                                 |  2 +-
 devscripts/requirements/requirements_tox.txt |  2 +-
 tox.ini                                      | 69 ++------------------
 4 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3cac068..ec960ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ matrix:
   include:
   - python: "2.7"
     env: TOXENV=py27
-  - python: "3.4"
-    env: TOXENV=py34
   - python: "3.5"
     env: TOXENV=py35
   - python: "3.6"
@@ -31,7 +29,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 da97b07..8cb4278 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -61,7 +61,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
diff --git a/devscripts/requirements/requirements_tox.txt b/devscripts/requirements/requirements_tox.txt
index ff4ecb6..8b5960b 100644
--- a/devscripts/requirements/requirements_tox.txt
+++ b/devscripts/requirements/requirements_tox.txt
@@ -1 +1 @@
-tox >= 2.0
+tox >= 3.15
diff --git a/tox.ini b/tox.ini
index df44464..230ab1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py27,py3{4,5,6,7,8,9},py{27,39}-flake8
+minversion = 3.15
+envlist = py27-sqlite,py3{4,5,6,7,8,9}-sqlite,py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -20,34 +20,13 @@ deps =
 passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
 platform = linux
 
-[general]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite]
 commands =
     {[testenv]commands}
     -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest --cov=m_librarian -D sqlite:///tmp/test.sqdb
 
-[testenv:py27]
-commands = {[general]commands}
-
-[testenv:py34]
-commands = {[general]commands}
-
-[testenv:py35]
-commands = {[general]commands}
-
-[testenv:py36]
-commands = {[general]commands}
-
-[testenv:py37]
-commands = {[general]commands}
-
-[testenv:py38]
-commands = {[general]commands}
-
-[testenv:py39]
-commands = {[general]commands}
-
-[sqlite-w32]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite-w32]
 platform = win32
 commands =
     {[testenv]commands}
@@ -55,46 +34,8 @@ commands =
     pytest --cov=m_librarian -D sqlite:/C:/projects/m-librarian/test.sqdb?debug=1
     rm.py -f C:/projects/m-librarian/test.sqdb
 
-[testenv:py27-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py34-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py35-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py36-sqlite-w32]
-platform = win32
-commands = {[sqlite-w32]commands}
-
-[testenv:py37-sqlite-w32]
-platform = win32
-commands =
-    {[sqlite-w32]commands}
-
-[testenv:py38-sqlite-w32]
-platform = win32
-commands =
-    {[sqlite-w32]commands}
-
-[testenv:py39-sqlite-w32]
-platform = win32
-commands =
-    {[sqlite-w32]commands}
-
 # flake8
-[testenv:py27-flake8]
-deps =
-    flake8
-commands =
-    {[testenv]commands}
-    flake8
-
-[testenv:py39-flake8]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
 deps =
     flake8
 commands =
-- 
2.39.5