diff --git a/.ci_support/aiida.py b/.ci_support/test_with_aiida.py similarity index 91% rename from .ci_support/aiida.py rename to .ci_support/test_with_aiida.py index 2c411ed..67d9b6e 100644 --- a/.ci_support/aiida.py +++ b/.ci_support/test_with_aiida.py @@ -1,8 +1,9 @@ -from python_workflow_definition.aiida import load_workflow_json from aiida import load_profile +load_profile() + +from python_workflow_definition.aiida import load_workflow_json if __name__ == "__main__": - load_profile() workgraph = load_workflow_json(file_name='workflow.json') workgraph.run() diff --git a/.ci_support/jobflow.py b/.ci_support/test_with_jobflow.py similarity index 100% rename from .ci_support/jobflow.py rename to .ci_support/test_with_jobflow.py diff --git a/.ci_support/pyiron.py b/.ci_support/test_with_pyiron.py similarity index 100% rename from .ci_support/pyiron.py rename to .ci_support/test_with_pyiron.py diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 7dab2fc..1dad4f1 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -18,14 +18,13 @@ jobs: miniforge-version: latest condarc-file: .condarc environment-file: environment.yml - - name: Installation and setup + - name: Test shell: bash -l {0} run: | pip install python-workflow-definition verdi presto --profile-name pwd - - name: Tests - shell: bash -l {0} - run: python .ci_support/aiida.py + cp .ci_support/test_with_aiida.py . + python test_with_aiida.py jobflow: runs-on: ubuntu-latest @@ -39,12 +38,12 @@ jobs: miniforge-version: latest condarc-file: .condarc environment-file: environment.yml - - name: Installation and setup - shell: bash -l {0} - run: pip install python-workflow-definition - - name: Tests + - name: Test shell: bash -l {0} - run: python .ci_support/jobflow.py + run: | + pip install python-workflow-definition + cp .ci_support/test_with_jobflow.py . + python test_with_jobflow.py pyiron: runs-on: ubuntu-latest @@ -58,9 +57,9 @@ jobs: miniforge-version: latest condarc-file: .condarc environment-file: environment.yml - - name: Installation and setup + - name: Test shell: bash -l {0} - run: pip install python-workflow-definition - - name: Tests - shell: bash -l {0} - run: python .ci_support/pyiron.py + run: | + pip install python-workflow-definition + cp .ci_support/test_with_pyiron.py . + python test_with_pyiron.py