Skip to content

Commit 1cccc3a

Browse files
authored
Follow standard directory structure (#129) (#133)
* Follow standard directory structure * fix license * Update environment.yml * Update pipeline.yml * Update environment.yml * Update pipeline.yml * Update environment.yml * Update environment.yml
1 parent 236a28c commit 1cccc3a

File tree

16 files changed

+9
-10
lines changed

16 files changed

+9
-10
lines changed

.github/workflows/pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: psf/black@stable
1414
with:
1515
options: "--check --diff"
16-
src: ./python_workflow_definition/src/python_workflow_definition
16+
src: ./src/python_workflow_definition
1717
- uses: psf/black@stable
1818
with:
1919
options: "--check --diff"
@@ -35,7 +35,7 @@ jobs:
3535
- name: Pip check
3636
shell: bash -l {0}
3737
run: |
38-
pip install --no-deps --no-build-isolation -e python_workflow_definition
38+
pip install --no-deps --no-build-isolation -e .
3939
pip check
4040
4141
nfdi4ing:
@@ -53,7 +53,7 @@ jobs:
5353
- name: Installation and setup
5454
shell: bash -l {0}
5555
run: |
56-
pip install --no-deps --no-build-isolation -e python_workflow_definition
56+
pip install --no-deps --no-build-isolation -e .
5757
conda install -c conda-forge jupyter papermill
5858
verdi presto --profile-name pwd
5959
sudo apt-get install -y $(cat binder/apt.txt)
@@ -92,7 +92,7 @@ jobs:
9292
shell: bash -l {0}
9393
run: |
9494
pip install --no-deps --no-build-isolation -e example_workflows/quantum_espresso/qe_xml_parser
95-
pip install --no-deps --no-build-isolation -e python_workflow_definition
95+
pip install --no-deps --no-build-isolation -e .
9696
conda install -c conda-forge jupyter papermill
9797
verdi presto --profile-name pwd
9898
- name: Tests
@@ -122,7 +122,7 @@ jobs:
122122
- name: Installation and setup
123123
shell: bash -l {0}
124124
run: |
125-
pip install --no-deps --no-build-isolation -e python_workflow_definition
125+
pip install --no-deps --no-build-isolation -e .
126126
conda install -c conda-forge jupyter papermill
127127
verdi presto --profile-name pwd
128128
- name: Tests

.github/workflows/pypi.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ jobs:
2626
environment-file: binder/environment.yml
2727
- name: Build
2828
shell: bash -l {0}
29-
run: |
30-
cd python_workflow_definition
31-
hatch build -t sdist -t wheel
29+
run: hatch build -t sdist -t wheel
3230
- name: Publish distribution 📦 to PyPI
3331
uses: pypa/gh-action-pypi-publish@release/v1
3432
with:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ cython_debug/
178178
input_tmp.in
179179
pyiron.log
180180
pyiron_draw.png
181-
python_workflow_definition/src/python_workflow_definition/__pycache__/
181+
src/python_workflow_definition/__pycache__/
182182
test/
183183
mini/
184184
evcurve.png

binder/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ channels:
22
- conda-forge
33
dependencies:
44
- python =3.12
5+
- click =8.1.8
56
- pydantic =2.11.4
67
- hatch =1.14.1
78
- hatchling =1.27.0

python_workflow_definition/pyproject.toml renamed to pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ authors = [
1414
{ name = "Marnik Bercx", email = "marnik.bercx@psi.ch" },
1515
{ name = "Christina Ertural", email = "christina.ertural@bam.de" },
1616
]
17-
license = { file = "../LICENSE" }
17+
license = { file = "LICENSE" }
1818
dependencies = [
1919
"numpy>=1.21,<2",
2020
"pydantic>=2.7.0,<=2.11.4",

0 commit comments

Comments
 (0)