From b12c924ca64da3f05181e09e0f2c55fe112f9b6e Mon Sep 17 00:00:00 2001
From: "Matthew W. Thompson" <mattwthompson@protonmail.com>
Date: Wed, 2 Oct 2024 16:26:13 -0500
Subject: [PATCH] Fix merge

---
 .github/workflows/CI.yml       | 1 -
 .github/workflows/beta_rc.yaml | 1 -
 .github/workflows/conda.yml    | 6 ++++--
 .github/workflows/examples.yml | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 17837d7c8..13d2f39e4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -76,7 +76,6 @@ jobs:
       - name: Install environment with ${{ env.JOBNAME }}
         uses: mamba-org/setup-micromamba@v1
         with:
-          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/${{ env.ENVFILE }}.yaml
           create-args: >-
             python=${{ matrix.python-version }}
diff --git a/.github/workflows/beta_rc.yaml b/.github/workflows/beta_rc.yaml
index e9318b5e8..6410ef104 100644
--- a/.github/workflows/beta_rc.yaml
+++ b/.github/workflows/beta_rc.yaml
@@ -34,7 +34,6 @@ jobs:
       - name: Install environment with ${{ env.JOBNAME }}
         uses: mamba-org/setup-micromamba@v1
         with:
-          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/test_env.yaml
           condarc: |
             channels:
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 6b25a00a2..8513cf2f6 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -38,15 +38,17 @@ jobs:
         uses: mamba-org/setup-micromamba@v1
         if: ${{ matrix.openeye == 'false' }}
         with:
-          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/conda.yaml
           create-args: >-
             python=${{ matrix.python-version }}
+          # default - will pull down 2.0 which we don't want!
+          # micromamba-version: latest
+          # pin to latest 1.x release
+          micromamba-version: "1.5.10-0"
       - name: Install from conda with OpenEye
         uses: mamba-org/setup-micromamba@v1
         if: ${{ matrix.openeye == 'true' }}
         with:
-          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/conda_oe.yaml
           create-args: >-
             python=${{ matrix.python-version }}
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 0ea1227ca..bf415296b 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -62,7 +62,6 @@ jobs:
       - name: Install conda environment with ${{ env.ENVFILE }}
         uses: mamba-org/setup-micromamba@v1
         with:
-          micromamba-version: '1.5.10-0'
           environment-file: devtools/conda-envs/${{env.ENVFILE}}-examples.yaml
           create-args: >-
             python=${{ matrix.python-version }}