From 543be1e0b3d4a9e77a77f8d485caad22918fdbf5 Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Sun, 3 Oct 2021 22:43:28 +1300
Subject: [PATCH 1/3] Add tomli as a dependency in GitHub Actions CI

Adding tomli to fix the GitHub Actions CI test
breakages reported in #1392. This is a temporary
measure until `pytest-cov>2.12.1` is released.
---
 .github/workflows/ci_tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
index 965ce7ad674..90ff760bd8f 100644
--- a/.github/workflows/ci_tests.yaml
+++ b/.github/workflows/ci_tests.yaml
@@ -97,7 +97,7 @@ jobs:
                         pandas xarray netCDF4 packaging \
                         ${{ matrix.optional-packages }} \
                         coverage[toml] dvc=2.3.0 make pytest>=6.0 \
-                        pytest-cov pytest-mpl sphinx-gallery
+                        pytest-cov pytest-mpl sphinx-gallery tomli
 
       # Show installed pkg information for postmortem diagnostic
       - name: List installed packages

From 86d770c6f083e685494e5f758f7765e2420c2050 Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Sun, 3 Oct 2021 22:54:59 +1300
Subject: [PATCH 2/3] Just install coverage without the toml specification

The optional `[toml]` part is `pip` syntax, and not
needed for `conda` or `mamba` install.
---
 .github/workflows/ci_tests.yaml | 2 +-
 environment.yml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
index 90ff760bd8f..7caf50ab55e 100644
--- a/.github/workflows/ci_tests.yaml
+++ b/.github/workflows/ci_tests.yaml
@@ -96,7 +96,7 @@ jobs:
           mamba install gmt=6.2.0 numpy=${{ matrix.numpy-version }} \
                         pandas xarray netCDF4 packaging \
                         ${{ matrix.optional-packages }} \
-                        coverage[toml] dvc=2.3.0 make pytest>=6.0 \
+                        coverage dvc=2.3.0 make pytest>=6.0 \
                         pytest-cov pytest-mpl sphinx-gallery tomli
 
       # Show installed pkg information for postmortem diagnostic
diff --git a/environment.yml b/environment.yml
index 34757cd180b..c6bfa01259d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -16,7 +16,7 @@ dependencies:
     # Development dependencies
     - black
     - blackdoc
-    - coverage[toml]
+    - coverage
     - docformatter
     - dvc=2.3.0
     - flake8

From b276b437ffdc3940c14874f3e01517861a83c9d5 Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Sun, 3 Oct 2021 23:26:15 +1300
Subject: [PATCH 3/3] Remove coverage dependency since it is required by
 pytest-cov already

---
 .github/workflows/ci_tests.yaml | 2 +-
 environment.yml                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
index 7caf50ab55e..61a859b5042 100644
--- a/.github/workflows/ci_tests.yaml
+++ b/.github/workflows/ci_tests.yaml
@@ -96,7 +96,7 @@ jobs:
           mamba install gmt=6.2.0 numpy=${{ matrix.numpy-version }} \
                         pandas xarray netCDF4 packaging \
                         ${{ matrix.optional-packages }} \
-                        coverage dvc=2.3.0 make pytest>=6.0 \
+                        dvc=2.3.0 make pytest>=6.0 \
                         pytest-cov pytest-mpl sphinx-gallery tomli
 
       # Show installed pkg information for postmortem diagnostic
diff --git a/environment.yml b/environment.yml
index c6bfa01259d..1e8849f27e9 100644
--- a/environment.yml
+++ b/environment.yml
@@ -16,7 +16,6 @@ dependencies:
     # Development dependencies
     - black
     - blackdoc
-    - coverage
     - docformatter
     - dvc=2.3.0
     - flake8