From 5890f7252095a1b96ddd49970e5762001425e06c Mon Sep 17 00:00:00 2001
From: Kevin James <KevinJames@thekev.in>
Date: Mon, 30 Dec 2019 18:50:41 -0600
Subject: [PATCH] chore: split coverage versions in ci

---
 .circleci/config.yml | 80 ++++++++++++++++++++++++++++++++++++++------
 tox.ini              | 16 ++++++---
 2 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8df8c5a4..e4412a58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,13 +13,26 @@ jobs:
       # TODO: figure out `<<parameters.docker_image>>.replace('.','')`
       tox_environment:
         type: string
+      cov_version:
+        default: ""
+        type: string
     steps:
       - run: apk add --no-cache gcc git libffi-dev musl-dev openssh-client openssl-dev
       - checkout
       - run: pip install tox tox-factor
-      - run: tox -f <<parameters.tox_environment>>
-      - run: tox -e coveralls
+      - unless:
+          condition: <<parameters.cov_version>>
+          steps:
+            - run: tox -f <<parameters.tox_environment>>
+            - run: tox -e coveralls41
+      - when:
+          condition: <<parameters.cov_version>>
+          steps:
+            - run: tox -f <<parameters.tox_environment>>-cov<<parameters.cov_version>>
+            - run: tox -e coveralls<<parameters.cov_version>>
 
+  # TODO: by introspecting `docker_image` (or `tox_environment`), we could
+  # these job definitions
   toxpypy:
     docker:
       - image: pypy:<<parameters.docker_image>>
@@ -29,11 +42,22 @@ jobs:
       # TODO: figure out `<<parameters.docker_image>>.replace('.','')`
       tox_environment:
         type: string
+      cov_version:
+        default: ""
+        type: string
     steps:
       - checkout
       - run: pip install tox tox-factor
-      - run: tox -f <<parameters.tox_environment>>
-      - run: tox -e coveralls
+      - unless:
+          condition: <<parameters.cov_version>>
+          steps:
+            - run: tox -f <<parameters.tox_environment>>
+            - run: tox -e coveralls41
+      - when:
+          condition: <<parameters.cov_version>>
+          steps:
+            - run: tox -f <<parameters.tox_environment>>-cov<<parameters.cov_version>>
+            - run: tox -e coveralls<<parameters.cov_version>>
 
 workflows:
   run-jobs:
@@ -54,17 +78,35 @@ workflows:
           docker_image: '3.5'
           tox_environment: py35
       - toxpy:
-          name: test-py3.6
+          name: test-py3.6-cov4
+          docker_image: '3.6'
+          tox_environment: py36
+          cov_version: '41'
+      - toxpy:
+          name: test-py3.6-cov5
           docker_image: '3.6'
           tox_environment: py36
+          cov_version: '5'
       - toxpy:
-          name: test-py3.7
+          name: test-py3.7-cov4
           docker_image: '3.7'
           tox_environment: py37
+          cov_version: '41'
+      - toxpy:
+          name: test-py3.7-cov5
+          docker_image: '3.7'
+          tox_environment: py37
+          cov_version: '5'
+      - toxpy:
+          name: test-py3.8-cov4
+          docker_image: '3.8'
+          tox_environment: py38
+          cov_version: '41'
       - toxpy:
           name: test-py3.8
           docker_image: '3.8'
           tox_environment: py38
+          cov_version: '5'
 
       - toxpypy:
           name: test-pypy2-5
@@ -80,14 +122,32 @@ workflows:
           tox_environment: pypy
 
       - toxpypy:
-          name: test-pypy3-5
+          name: test-pypy3-5-cov4
           docker_image: 3-5
           tox_environment: pypy3
+          cov_version: '41'
       - toxpypy:
-          name: test-pypy3-6
+          name: test-pypy3-5-cov5
+          docker_image: 3-5
+          tox_environment: pypy3
+          cov_version: '5'
+      - toxpypy:
+          name: test-pypy3-6-cov4
+          docker_image: 3-6
+          tox_environment: pypy3
+          cov_version: '41'
+      - toxpypy:
+          name: test-pypy3-6-cov5
           docker_image: 3-6
           tox_environment: pypy3
+          cov_version: '5'
       - toxpypy:
-          name: test-pypy3-7
+          name: test-pypy3-7-cov4
           docker_image: 3-7
-          tox_environment: pypy37
+          tox_environment: pypy3
+          cov_version: '41'
+      - toxpypy:
+          name: test-pypy3-7-cov5
+          docker_image: 3-7
+          tox_environment: pypy3
+          cov_version: '5'
diff --git a/tox.ini b/tox.ini
index dd5ed0d1..2ba185b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,9 +5,9 @@ envlist = py{27,34,35,py}-cov{3,4,41}-{default,pyyaml},py{36,37,38,py3}-cov{41,5
 python =
     2.7: py27
     3.5: py35
-    3.6: py36
-    3.7: py37
-    3.8: py38
+    3.6: py36-cov5
+    3.7: py37-cov5
+    3.8: py38-cov5
 
 [testenv]
 passenv = *
@@ -25,8 +25,14 @@ commands =
     coverage run --branch --source=coveralls -m pytest tests/
     coverage report -m
 
-[testenv:coveralls]
+[testenv:coveralls41]
 deps =
-    coverage<6.0
+    coverage>=4.1,<5.0
+commands =
+    coveralls --verbose
+
+[testenv:coveralls5]
+deps =
+    coverage>=5.0,<6.0
 commands =
     coveralls --verbose