Skip to content

Commit f8110b5

Browse files
Fix merge (#1943)
1 parent 21536cc commit f8110b5

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ jobs:
7676
- name: Install environment with ${{ env.JOBNAME }}
7777
uses: mamba-org/setup-micromamba@v1
7878
with:
79-
micromamba-version: '1.5.10-0'
8079
environment-file: devtools/conda-envs/${{ env.ENVFILE }}.yaml
8180
create-args: >-
8281
python=${{ matrix.python-version }}

.github/workflows/beta_rc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- name: Install environment with ${{ env.JOBNAME }}
3535
uses: mamba-org/setup-micromamba@v1
3636
with:
37-
micromamba-version: '1.5.10-0'
3837
environment-file: devtools/conda-envs/test_env.yaml
3938
condarc: |
4039
channels:

.github/workflows/conda.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,17 @@ jobs:
3838
uses: mamba-org/setup-micromamba@v1
3939
if: ${{ matrix.openeye == 'false' }}
4040
with:
41-
micromamba-version: '1.5.10-0'
4241
environment-file: devtools/conda-envs/conda.yaml
4342
create-args: >-
4443
python=${{ matrix.python-version }}
44+
# default - will pull down 2.0 which we don't want!
45+
# micromamba-version: latest
46+
# pin to latest 1.x release
47+
micromamba-version: "1.5.10-0"
4548
- name: Install from conda with OpenEye
4649
uses: mamba-org/setup-micromamba@v1
4750
if: ${{ matrix.openeye == 'true' }}
4851
with:
49-
micromamba-version: '1.5.10-0'
5052
environment-file: devtools/conda-envs/conda_oe.yaml
5153
create-args: >-
5254
python=${{ matrix.python-version }}

.github/workflows/examples.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
- name: Install conda environment with ${{ env.ENVFILE }}
6363
uses: mamba-org/setup-micromamba@v1
6464
with:
65-
micromamba-version: '1.5.10-0'
6665
environment-file: devtools/conda-envs/${{env.ENVFILE}}-examples.yaml
6766
create-args: >-
6867
python=${{ matrix.python-version }}

0 commit comments

Comments
 (0)