Skip to content

Commit

Permalink
Merge pull request #311 from pyiron/condaenv
Browse files Browse the repository at this point in the history
Update conda-incubator/setup-miniconda from v2 to v3
  • Loading branch information
jan-janssen committed Jul 7, 2024
2 parents e80dd81 + f205d4b commit 41aef8d
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 21 deletions.
1 change: 0 additions & 1 deletion .github/variables/cache_number.env

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
cp .ci_support/environment.yml environment.yml
echo "- flux-core =0.59.0" >> environment.yml
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: '3.12'
miniforge-variant: Mambaforge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
id-token: write
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v2.2.0
- uses: conda-incubator/setup-miniconda@v3
with:
python-version: "3.12"
mamba-version: "*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
sed -i '/paramiko/d' environment.yml
sed -i '/tqdm/d' environment.yml
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: '3.12'
miniforge-variant: Mambaforge
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
cp binder/environment.yml environment.yml
tail --lines=+4 .ci_support/environment-notebooks.yml >> environment.yml
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: "3.12"
miniforge-variant: Mambaforge
Expand All @@ -37,4 +37,4 @@ jobs:
shell: bash -l {0}
run: >
flux start
papermill notebooks/example.ipynb example-out.ipynb -k "python3"
papermill notebooks/example.ipynb example-out.ipynb -k "python3"
2 changes: 1 addition & 1 deletion .github/workflows/pypicheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: '3.12'
miniforge-variant: Mambaforge
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,26 @@ jobs:
include:
- operating-system: macos-latest
python-version: '3.12'
label: osx-64-py-3-12
prefix: /Users/runner/miniconda3/envs/my-env

- operating-system: windows-latest
python-version: '3.12'
label: win-64-py-3-12
prefix: C:\Miniconda3\envs\my-env

- operating-system: ubuntu-latest
python-version: '3.12'
label: linux-64-py-3-12
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.11'
label: linux-64-py-3-11
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.10'
label: linux-64-py-3-10
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: 3.9
label: linux-64-py-3-9
prefix: /usr/share/miniconda3/envs/my-env

steps:
- uses: actions/checkout@v4
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: ${{ matrix.python-version }}
miniforge-variant: Mambaforge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests_old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: '3.9'
miniforge-variant: Mambaforge
Expand Down

0 comments on commit 41aef8d

Please sign in to comment.