Merge branch 'main' into pyfive

NCAS-CMS · Oct 24, 2024 · 4b18a17 · 4b18a17
2 parents 74868b7 + 3d1968a
commit 4b18a17
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 141 deletions.
diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml
@@ -29,7 +29,6 @@ jobs:
           activate-environment: activestorage-fromlock
           python-version: "3.12"
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - name: Show conda config
         run: |

diff --git a/.github/workflows/run-test-push.yml b/.github/workflows/run-test-push.yml
@@ -26,7 +26,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - run: conda --version
       - run: python -V

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -31,7 +31,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - run: conda --version
       - run: python -V
@@ -64,7 +63,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - run: conda --version
       - run: python -V

diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml
@@ -32,7 +32,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - name: Get conda and Python versions
         run: |
@@ -56,7 +55,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - name: Install development version of bnlawrence/Pyfive:issue60
         run: |

diff --git a/.github/workflows/test_s3_remote_reductionist.yml b/.github/workflows/test_s3_remote_reductionist.yml
@@ -33,7 +33,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - name: Get conda and Python versions
         run: |
@@ -51,7 +50,6 @@ jobs:
           environment-file: environment.yml
           python-version: ${{ matrix.python-version }}
           miniforge-version: "latest"
-          miniforge-variant: Mambaforge
           use-mamba: true
       - name: Install development version of bnlawrence/Pyfive:issue60
         run: |