Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge with master #1457

Merged
merged 6 commits into from
Jan 19, 2023
Merged

Merge with master #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff74f37
Update docs.yml
jan-janssen Jan 17, 2023
1eb2c34
Update notebooks.yml
jan-janssen Jan 17, 2023
452903a
Update pypicheck.yml
jan-janssen Jan 17, 2023
0ce7694
Update environment.yml
jan-janssen Jan 18, 2023
8abde00
Update environment.yml
jan-janssen Jan 18, 2023
82b7593
Merge pull request #1456 from pyiron/conda_bug
jan-janssen Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v2.2.0
with:
python-version: "3.10"
mamba-version: "*"
channels: conda-forge
channel-priority: strict
auto-update-conda: true
environment-file: .ci_support/environment.yml
miniforge-variant: Mambaforge
- name: Setup
shell: bash -l {0}
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/notebooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.2.0
- name: Merge Environments
shell: bash -l {0}
run: |
Expand All @@ -28,6 +28,7 @@ jobs:
channel-priority: strict
auto-update-conda: true
environment-file: .ci_support/environment.yml
miniforge-variant: Mambaforge
- name: Setup
shell: bash -l {0}
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pypicheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v2.2.0
with:
python-version: "3.10"
mamba-version: "*"
channels: conda-forge
channel-priority: strict
auto-update-conda: true
environment-file: .ci_support/environment.yml
miniforge-variant: Mambaforge
- name: Setup
shell: bash -l {0}
run: |
Expand Down