Fix merge

openforcefield · Oct 3, 2024 · 3f4c826 · 3f4c826
1 parent 21536cc
commit 3f4c826
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 }}