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.

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

Merge main #48

Merged
merged 25 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b3acba9
Add example for running the workflow without a workflow framework
jan-janssen Oct 9, 2024
fae141d
Create basic.yml
jan-janssen Oct 10, 2024
ee1e4cc
Update aiida.yml
jan-janssen Oct 10, 2024
18aa78c
Update book.yml
jan-janssen Oct 10, 2024
6e7d6bf
Update delpoy.yml
jan-janssen Oct 10, 2024
96e448b
Update jobflow.yml
jan-janssen Oct 10, 2024
6d8ccc7
Update pyiron.yml
jan-janssen Oct 10, 2024
5dfb759
Merge pull request #39 from materialdigital/CI
jan-janssen Oct 10, 2024
610d2a2
Update basic.yml
jan-janssen Oct 10, 2024
344803f
Merge pull request #38 from materialdigital/noworkflowframework
jan-janssen Oct 22, 2024
4e8528d
Update pyiron_base to 0.10.4
jan-janssen Oct 22, 2024
463a19b
Merge pull request #41 from materialdigital/pyiron_base
jan-janssen Oct 22, 2024
5c27525
Remove pyiron related import
jan-janssen Oct 22, 2024
69194b7
Merge pull request #42 from materialdigital/basic
jan-janssen Oct 22, 2024
a1fd224
Update basic notebook
jan-janssen Oct 22, 2024
46aeac5
Add files via upload
jan-janssen Oct 22, 2024
630993e
Update environment.yml
jan-janssen Oct 22, 2024
855d5e5
Merge pull request #43 from materialdigital/basicupdate
jan-janssen Oct 22, 2024
193a899
Merge pull request #44 from materialdigital/pyiron_decorator
jan-janssen Oct 22, 2024
e5affff
Update aiida.yml
jan-janssen Nov 5, 2024
b547d80
Update basic.yml
jan-janssen Nov 5, 2024
775de67
Update book.yml
jan-janssen Nov 5, 2024
c25753f
Update jobflow.yml
jan-janssen Nov 5, 2024
b287475
Update pyiron.yml
jan-janssen Nov 5, 2024
a3962ff
Merge pull request #47 from materialdigital/ci_always
jan-janssen Nov 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.5
- qe=7.2
- qe-tools=2.0.0
- ase=3.23.0
Expand Down
408 changes: 407 additions & 1 deletion pyiron_base.ipynb

Large diffs are not rendered by default.

Loading