From 35b265415453852df48aeb31185c0513879337cc Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@securityinnovation.com>
Date: Thu, 10 Dec 2020 15:02:26 -0500
Subject: [PATCH] Consolidate tox.ini setup test definitions

---
 .github/workflows/tests.yml | 10 +++++-----
 .travis.yml                 |  8 ++++----
 tox.ini                     | 40 +++----------------------------------
 3 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 703c126..0af24a5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,15 +27,15 @@ jobs:
       matrix:
         include:
           - python-version: 3.5
-            env: setup35
+            env: py35-setup
           - python-version: 3.6
-            env: setup36
+            env: py36-setup
           - python-version: 3.7
-            env: setup37
+            env: py37-setup
           - python-version: 3.8
-            env: setup38
+            env: py38-setup
           - python-version: 3.9
-            env: setup39
+            env: py39-setup
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index c83bb1b..dc9c47d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,16 @@ jobs:
 
     # test setup.py using each tested version
     - python: 3.8
-      env: TOXENV=setup38
+      env: TOXENV=py38-setup
 
     - python: 3.7
-      env: TOXENV=setup37
+      env: TOXENV=py37-setup
 
     - python: 3.6
-      env: TOXENV=setup36
+      env: TOXENV=py36-setup
 
     - python: 3.5
-      env: TOXENV=setup35
+      env: TOXENV=py35-setup
 
     # do some tests with LC_ALL=C to check for locale variance
     - python: 3.6
diff --git a/tox.ini b/tox.ini
index d74ea80..1f092c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37,38,39}, setup{35,36,37,38,39}, pypy3, pep8
+envlist = py{35,36,37,38,39}, py{35,36,37,38,39}-setup, pypy3, pep8
 skipsdist = True
 
 [pytest]
@@ -29,7 +29,8 @@ install_command = pip install {opts} --no-cache-dir {packages}
 commands =
     py.test --cov pgpy --cov-report term-missing tests/
 
-[test-setup]
+[testenv:py{35,36,37,38,39}-setup]
+recreate = True
 allowlist_externals =
     /usr/bin/rm
     /bin/rm
@@ -38,41 +39,6 @@ commands =
     pip install -e .
     rm -rf PGPy.egg-info
 
-[testenv:setup39]
-recreate = True
-basepython = python3.9
-allowlist_externals = {[test-setup]allowlist_externals}
-deps =
-commands = {[test-setup]commands}
-
-[testenv:setup38]
-recreate = True
-basepython = python3.8
-allowlist_externals = {[test-setup]allowlist_externals}
-deps =
-commands = {[test-setup]commands}
-
-[testenv:setup37]
-recreate = True
-basepython = python3.7
-allowlist_externals = {[test-setup]allowlist_externals}
-deps =
-commands = {[test-setup]commands}
-
-[testenv:setup36]
-recreate = True
-basepython = python3.6
-allowlist_externals = {[test-setup]allowlist_externals}
-deps =
-commands = {[test-setup]commands}
-
-[testenv:setup35]
-recreate = True
-basepython = python3.5
-allowlist_externals = {[test-setup]allowlist_externals}
-deps =
-commands = {[test-setup]commands}
-
 [testenv:pep8]
 basepython = python3.6
 deps =