From 63adf3d2e912c19ebb1deb575ee94ceeafb88063 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 4 Oct 2024 18:10:10 +0200
Subject: [PATCH 1/5] bump umamba 2

---
 .github/workflows/cc-plugin-ncei-test.yml  | 2 +-
 .github/workflows/cc-plugin-og-test.yml    | 2 +-
 .github/workflows/cc-plugin-sgrid-test.yml | 2 +-
 .github/workflows/cc-plugin-ugrid-test.yml | 2 +-
 .github/workflows/codecov.yml              | 2 +-
 .github/workflows/default-tests.yml        | 2 +-
 .github/workflows/deploy-docs.yml          | 2 +-
 .github/workflows/integration-tests.yml    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cc-plugin-ncei-test.yml b/.github/workflows/cc-plugin-ncei-test.yml
index 9bace25c..6f24366f 100644
--- a/.github/workflows/cc-plugin-ncei-test.yml
+++ b/.github/workflows/cc-plugin-ncei-test.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/cc-plugin-og-test.yml b/.github/workflows/cc-plugin-og-test.yml
index 3df4d263..f79850b6 100644
--- a/.github/workflows/cc-plugin-og-test.yml
+++ b/.github/workflows/cc-plugin-og-test.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/cc-plugin-sgrid-test.yml b/.github/workflows/cc-plugin-sgrid-test.yml
index a73e9604..3fe35d3a 100644
--- a/.github/workflows/cc-plugin-sgrid-test.yml
+++ b/.github/workflows/cc-plugin-sgrid-test.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/cc-plugin-ugrid-test.yml b/.github/workflows/cc-plugin-ugrid-test.yml
index 51522bc2..0cab2d36 100644
--- a/.github/workflows/cc-plugin-ugrid-test.yml
+++ b/.github/workflows/cc-plugin-ugrid-test.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index c32a9fb4..f1007185 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml
index 08ee54c6..d3b272d8 100644
--- a/.github/workflows/default-tests.yml
+++ b/.github/workflows/default-tests.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba ${{ matrix.python-version }}
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 574b648f..6eae9d5d 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -18,7 +18,7 @@ jobs:
         fetch-depth: 0
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 87c46cfe..ea54d31a 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash

From 673acf791819283ab3fbb2d4eb2330d05651da78 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 4 Oct 2024 18:10:18 +0200
Subject: [PATCH 2/5] do we still need this pin?

---
 test_requirements.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test_requirements.txt b/test_requirements.txt
index 3b2c22ad..1ebf0279 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -11,5 +11,3 @@ pytest>=2.9.0
 pytest-cov>=3.0.0
 pytest-vcr
 requests-mock>=1.7.0
-# We need this pin until a new version of vcrpy is out.
-urllib3<2

From 76c539430f47a0eb43db71c9025830bc060db6c6 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 4 Oct 2024 18:17:10 +0200
Subject: [PATCH 3/5] remove inline comments too

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 914faa1e..1a61c43b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 cf-units>=2
 cftime>=1.1.0
-importlib-metadata  # drop this when dropping Python 3.8
-importlib-resources  # drop this when dropping Python 3.8
+importlib-metadata
+importlib-resources
 isodate>=0.6.1
 jinja2>=2.7.3
 lxml>=3.2.1

From 755f71fd1b01f86df468a8a2454eccb1c46d15c8 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 4 Oct 2024 18:17:57 +0200
Subject: [PATCH 4/5] missed a spot

---
 .github/workflows/cc-plugin-glider-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cc-plugin-glider-test.yml b/.github/workflows/cc-plugin-glider-test.yml
index 09f0f025..e147c0ef 100644
--- a/.github/workflows/cc-plugin-glider-test.yml
+++ b/.github/workflows/cc-plugin-glider-test.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup Micromamba
-      uses: mamba-org/setup-micromamba@v1
+      uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
         init-shell: bash

From ae023d1831a0911f7a69096ef6ddb5d68d56fc2e Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 4 Oct 2024 18:31:36 +0200
Subject: [PATCH 5/5] new umamba syntax

---
 .github/workflows/cc-plugin-glider-test.yml | 2 +-
 .github/workflows/cc-plugin-ncei-test.yml   | 2 +-
 .github/workflows/cc-plugin-og-test.yml     | 2 +-
 .github/workflows/cc-plugin-sgrid-test.yml  | 2 +-
 .github/workflows/cc-plugin-ugrid-test.yml  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cc-plugin-glider-test.yml b/.github/workflows/cc-plugin-glider-test.yml
index e147c0ef..bd9d3058 100644
--- a/.github/workflows/cc-plugin-glider-test.yml
+++ b/.github/workflows/cc-plugin-glider-test.yml
@@ -33,6 +33,6 @@ jobs:
         git clone https://github.com/ioos/cc-plugin-glider.git
         && cd cc-plugin-glider
         && micromamba install --file requirements.txt --file requirements-dev.txt --channel conda-forge
-        && micromamba remove compliance-checker --no-prune --force
+        && micromamba remove compliance-checker --no-prune-deps --force
         && python -m pip install -e . --no-deps --force-reinstall
         && python -m pytest -s -rxs -v cc_plugin_glider
diff --git a/.github/workflows/cc-plugin-ncei-test.yml b/.github/workflows/cc-plugin-ncei-test.yml
index 6f24366f..ae322ad5 100644
--- a/.github/workflows/cc-plugin-ncei-test.yml
+++ b/.github/workflows/cc-plugin-ncei-test.yml
@@ -33,6 +33,6 @@ jobs:
         git clone https://github.com/ioos/cc-plugin-ncei.git
         && cd cc-plugin-ncei
         && micromamba install --file requirements.txt --file requirements-dev.txt --channel conda-forge
-        && micromamba remove compliance-checker --no-prune --force
+        && micromamba remove compliance-checker --no-prune-deps --force
         && python -m pip install -e . --no-deps --force-reinstall
         && python -m pytest -s -rxs -v cc_plugin_ncei
diff --git a/.github/workflows/cc-plugin-og-test.yml b/.github/workflows/cc-plugin-og-test.yml
index f79850b6..c74a033b 100644
--- a/.github/workflows/cc-plugin-og-test.yml
+++ b/.github/workflows/cc-plugin-og-test.yml
@@ -33,6 +33,6 @@ jobs:
         git clone https://github.com/uw-farlab/cc-plugin-og.git
         && cd cc-plugin-og
         && micromamba install --file requirements.txt --channel conda-forge
-        && micromamba remove compliance-checker --no-prune --force
+        && micromamba remove compliance-checker --no-prune-deps --force
         && python -m pip install -e . --no-deps --force-reinstall
         && python -m pytest -s -rxs -v cc_plugin_og
diff --git a/.github/workflows/cc-plugin-sgrid-test.yml b/.github/workflows/cc-plugin-sgrid-test.yml
index 3fe35d3a..153603ff 100644
--- a/.github/workflows/cc-plugin-sgrid-test.yml
+++ b/.github/workflows/cc-plugin-sgrid-test.yml
@@ -33,6 +33,6 @@ jobs:
         git clone https://github.com/ioos/cc-plugin-sgrid.git
         && cd cc-plugin-sgrid
         && micromamba install --file requirements.txt --file requirements-dev.txt --channel conda-forge
-        && micromamba remove compliance-checker --no-prune --force
+        && micromamba remove compliance-checker --no-prune-deps --force
         && python -m pip install -e . --no-deps --force-reinstall
         && python -m pytest -s -rxs -v cc_plugin_sgrid
diff --git a/.github/workflows/cc-plugin-ugrid-test.yml b/.github/workflows/cc-plugin-ugrid-test.yml
index 0cab2d36..1cb7abf0 100644
--- a/.github/workflows/cc-plugin-ugrid-test.yml
+++ b/.github/workflows/cc-plugin-ugrid-test.yml
@@ -33,6 +33,6 @@ jobs:
         git clone https://github.com/ioos/cc-checker-ugrid.git
         && cd cc-checker-ugrid
         && micromamba install --file requirements.txt --file requirements-dev.txt --channel conda-forge
-        && micromamba remove compliance-checker --no-prune --force
+        && micromamba remove compliance-checker --no-prune-deps --force
         && python -m pip install -e . --no-deps --force-reinstall
         && python -m pytest -s -rxs -v cc_plugin_ugrid