Merge pull request #1111 from ocefpaf/fix_umamba

Fixes micromamba v2 failures
ioos · Oct 4, 2024 · 40940a7 · 40940a7
2 parents 1f83978 + ae023d1
commit 40940a7
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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/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

diff --git 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