Skip to content

Commit

Permalink
Merge pull request #52 from materialdigital/main
Browse files Browse the repository at this point in the history
Merge main
  • Loading branch information
jan-janssen authored Nov 6, 2024
2 parents 18d2b29 + 8e1e637 commit 4af9f50
Show file tree
Hide file tree
Showing 9 changed files with 447 additions and 16 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/aiida.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.11"
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: basic

on:
push:
branches: [ main ]
pull_request:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.11"
environment-file: environment.yml
auto-activate-base: false
- name: Tests
shell: bash -l {0}
run: |
pip install -e aiida_qe_basic
conda install -c conda-forge jupyter papermill
export ESPRESSO_PSEUDO=$(pwd)/espresso/pseudo
papermill basic.ipynb basic-out.ipynb -k "python3"
5 changes: 2 additions & 3 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ name: Jupyterbook

on:
pull_request:
branches: [ main ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.11"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/delpoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.11"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/jobflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.11"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pyiron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: "3.11"
Expand Down
1 change: 1 addition & 0 deletions basic.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ channels:
- conda-forge
dependencies:
- python=3.11
- pyiron_base=0.9.11
- pyiron_base=0.10.6
- qe=7.2
- qe-tools=2.0.0
- ase=3.23.0
Expand Down
409 changes: 408 additions & 1 deletion pyiron_base.ipynb

Large diffs are not rendered by default.

0 comments on commit 4af9f50

Please sign in to comment.