diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b31df386..72cdb30a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,7 +31,7 @@ jobs: run: | cp .ci_support/environment-old.yml environment.yml python .ci_support/release.py; cat pyproject.toml - git update-index --assume-unchanged pyproject.toml executorlib/_version.py + git update-index --assume-unchanged pyproject.toml src/executorlib/_version.py hatchling build -t sdist -t wheel - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 0d802faf..33cf959d 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -13,7 +13,7 @@ jobs: - uses: psf/black@stable with: options: "--check --diff" - src: ./${{ github.event.repository.name }} + src: ./src/${{ github.event.repository.name }} black_fix: # in most cases pre-commit is faster needs: [black] @@ -29,7 +29,7 @@ jobs: uses: psf/black@stable with: options: "" - src: "./${{ github.event.repository.name }}" + src: "./src/${{ github.event.repository.name }}" - name: commit run: | git config --local user.email "pyiron@mpie.de" @@ -55,7 +55,7 @@ jobs: - name: Install mypy run: pip install mypy - name: Test - run: mypy --ignore-missing-imports ${{ github.event.repository.name }} + run: mypy --ignore-missing-imports src/${{ github.event.repository.name }} minimal: needs: [black] @@ -451,7 +451,7 @@ jobs: timeout-minutes: 10 run: | conda install -y pylint graphviz - pyreverse -o png -p ./${{ github.event.repository.name }} ./${{ github.event.repository.name }} + pyreverse -o png -p ./src/${{ github.event.repository.name }} ./src/${{ github.event.repository.name }} zip -m uml.zip *.png - uses: actions/upload-artifact@v4 with: diff --git a/pyproject.toml b/pyproject.toml index 7008c472..7aa46043 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,26 +103,26 @@ ignore = [ [tool.hatch.build] include = [ - "executorlib" + "src/executorlib" ] [tool.hatch.build.hooks.vcs] -version-file = "executorlib/_version.py" +version-file = "src/executorlib/_version.py" [tool.hatch.build.targets.sdist] include = [ - "executorlib" + "src/executorlib" ] [tool.hatch.build.targets.wheel] packages = [ - "executorlib" + "src/executorlib" ] [tool.hatch.version] source = "vcs" -path = "executorlib/_version.py" +path = "src/executorlib/_version.py" [tool.coverage.run] -omit = ["executorlib/_version.py", "tests/*"] +source = ["executorlib"] command_line = "-m unittest discover tests" diff --git a/executorlib/__init__.py b/src/executorlib/__init__.py similarity index 100% rename from executorlib/__init__.py rename to src/executorlib/__init__.py diff --git a/executorlib/_version.py b/src/executorlib/_version.py similarity index 100% rename from executorlib/_version.py rename to src/executorlib/_version.py diff --git a/executorlib/api.py b/src/executorlib/api.py similarity index 100% rename from executorlib/api.py rename to src/executorlib/api.py diff --git a/executorlib/backend/__init__.py b/src/executorlib/backend/__init__.py similarity index 100% rename from executorlib/backend/__init__.py rename to src/executorlib/backend/__init__.py diff --git a/executorlib/backend/cache_parallel.py b/src/executorlib/backend/cache_parallel.py similarity index 100% rename from executorlib/backend/cache_parallel.py rename to src/executorlib/backend/cache_parallel.py diff --git a/executorlib/backend/cache_serial.py b/src/executorlib/backend/cache_serial.py similarity index 100% rename from executorlib/backend/cache_serial.py rename to src/executorlib/backend/cache_serial.py diff --git a/executorlib/backend/interactive_parallel.py b/src/executorlib/backend/interactive_parallel.py similarity index 100% rename from executorlib/backend/interactive_parallel.py rename to src/executorlib/backend/interactive_parallel.py diff --git a/executorlib/backend/interactive_serial.py b/src/executorlib/backend/interactive_serial.py similarity index 100% rename from executorlib/backend/interactive_serial.py rename to src/executorlib/backend/interactive_serial.py diff --git a/executorlib/executor/__init__.py b/src/executorlib/executor/__init__.py similarity index 100% rename from executorlib/executor/__init__.py rename to src/executorlib/executor/__init__.py diff --git a/executorlib/executor/base.py b/src/executorlib/executor/base.py similarity index 100% rename from executorlib/executor/base.py rename to src/executorlib/executor/base.py diff --git a/executorlib/executor/flux.py b/src/executorlib/executor/flux.py similarity index 100% rename from executorlib/executor/flux.py rename to src/executorlib/executor/flux.py diff --git a/executorlib/executor/single.py b/src/executorlib/executor/single.py similarity index 100% rename from executorlib/executor/single.py rename to src/executorlib/executor/single.py diff --git a/executorlib/executor/slurm.py b/src/executorlib/executor/slurm.py similarity index 100% rename from executorlib/executor/slurm.py rename to src/executorlib/executor/slurm.py diff --git a/executorlib/standalone/__init__.py b/src/executorlib/standalone/__init__.py similarity index 100% rename from executorlib/standalone/__init__.py rename to src/executorlib/standalone/__init__.py diff --git a/executorlib/standalone/batched.py b/src/executorlib/standalone/batched.py similarity index 100% rename from executorlib/standalone/batched.py rename to src/executorlib/standalone/batched.py diff --git a/executorlib/standalone/command.py b/src/executorlib/standalone/command.py similarity index 100% rename from executorlib/standalone/command.py rename to src/executorlib/standalone/command.py diff --git a/executorlib/standalone/error.py b/src/executorlib/standalone/error.py similarity index 100% rename from executorlib/standalone/error.py rename to src/executorlib/standalone/error.py diff --git a/executorlib/standalone/hdf.py b/src/executorlib/standalone/hdf.py similarity index 100% rename from executorlib/standalone/hdf.py rename to src/executorlib/standalone/hdf.py diff --git a/executorlib/standalone/inputcheck.py b/src/executorlib/standalone/inputcheck.py similarity index 100% rename from executorlib/standalone/inputcheck.py rename to src/executorlib/standalone/inputcheck.py diff --git a/executorlib/standalone/interactive/__init__.py b/src/executorlib/standalone/interactive/__init__.py similarity index 100% rename from executorlib/standalone/interactive/__init__.py rename to src/executorlib/standalone/interactive/__init__.py diff --git a/executorlib/standalone/interactive/arguments.py b/src/executorlib/standalone/interactive/arguments.py similarity index 100% rename from executorlib/standalone/interactive/arguments.py rename to src/executorlib/standalone/interactive/arguments.py diff --git a/executorlib/standalone/interactive/backend.py b/src/executorlib/standalone/interactive/backend.py similarity index 100% rename from executorlib/standalone/interactive/backend.py rename to src/executorlib/standalone/interactive/backend.py diff --git a/executorlib/standalone/interactive/communication.py b/src/executorlib/standalone/interactive/communication.py similarity index 100% rename from executorlib/standalone/interactive/communication.py rename to src/executorlib/standalone/interactive/communication.py diff --git a/executorlib/standalone/interactive/spawner.py b/src/executorlib/standalone/interactive/spawner.py similarity index 100% rename from executorlib/standalone/interactive/spawner.py rename to src/executorlib/standalone/interactive/spawner.py diff --git a/executorlib/standalone/queue.py b/src/executorlib/standalone/queue.py similarity index 100% rename from executorlib/standalone/queue.py rename to src/executorlib/standalone/queue.py diff --git a/executorlib/standalone/scheduler.py b/src/executorlib/standalone/scheduler.py similarity index 100% rename from executorlib/standalone/scheduler.py rename to src/executorlib/standalone/scheduler.py diff --git a/executorlib/standalone/select.py b/src/executorlib/standalone/select.py similarity index 100% rename from executorlib/standalone/select.py rename to src/executorlib/standalone/select.py diff --git a/executorlib/standalone/serialize.py b/src/executorlib/standalone/serialize.py similarity index 100% rename from executorlib/standalone/serialize.py rename to src/executorlib/standalone/serialize.py diff --git a/executorlib/task_scheduler/__init__.py b/src/executorlib/task_scheduler/__init__.py similarity index 100% rename from executorlib/task_scheduler/__init__.py rename to src/executorlib/task_scheduler/__init__.py diff --git a/executorlib/task_scheduler/base.py b/src/executorlib/task_scheduler/base.py similarity index 100% rename from executorlib/task_scheduler/base.py rename to src/executorlib/task_scheduler/base.py diff --git a/executorlib/task_scheduler/file/__init__.py b/src/executorlib/task_scheduler/file/__init__.py similarity index 100% rename from executorlib/task_scheduler/file/__init__.py rename to src/executorlib/task_scheduler/file/__init__.py diff --git a/executorlib/task_scheduler/file/backend.py b/src/executorlib/task_scheduler/file/backend.py similarity index 100% rename from executorlib/task_scheduler/file/backend.py rename to src/executorlib/task_scheduler/file/backend.py diff --git a/executorlib/task_scheduler/file/shared.py b/src/executorlib/task_scheduler/file/shared.py similarity index 100% rename from executorlib/task_scheduler/file/shared.py rename to src/executorlib/task_scheduler/file/shared.py diff --git a/executorlib/task_scheduler/file/spawner_pysqa.py b/src/executorlib/task_scheduler/file/spawner_pysqa.py similarity index 100% rename from executorlib/task_scheduler/file/spawner_pysqa.py rename to src/executorlib/task_scheduler/file/spawner_pysqa.py diff --git a/executorlib/task_scheduler/file/spawner_subprocess.py b/src/executorlib/task_scheduler/file/spawner_subprocess.py similarity index 100% rename from executorlib/task_scheduler/file/spawner_subprocess.py rename to src/executorlib/task_scheduler/file/spawner_subprocess.py diff --git a/executorlib/task_scheduler/file/task_scheduler.py b/src/executorlib/task_scheduler/file/task_scheduler.py similarity index 100% rename from executorlib/task_scheduler/file/task_scheduler.py rename to src/executorlib/task_scheduler/file/task_scheduler.py diff --git a/executorlib/task_scheduler/interactive/__init__.py b/src/executorlib/task_scheduler/interactive/__init__.py similarity index 100% rename from executorlib/task_scheduler/interactive/__init__.py rename to src/executorlib/task_scheduler/interactive/__init__.py diff --git a/executorlib/task_scheduler/interactive/blockallocation.py b/src/executorlib/task_scheduler/interactive/blockallocation.py similarity index 100% rename from executorlib/task_scheduler/interactive/blockallocation.py rename to src/executorlib/task_scheduler/interactive/blockallocation.py diff --git a/executorlib/task_scheduler/interactive/dependency.py b/src/executorlib/task_scheduler/interactive/dependency.py similarity index 100% rename from executorlib/task_scheduler/interactive/dependency.py rename to src/executorlib/task_scheduler/interactive/dependency.py diff --git a/executorlib/task_scheduler/interactive/dependency_plot.py b/src/executorlib/task_scheduler/interactive/dependency_plot.py similarity index 100% rename from executorlib/task_scheduler/interactive/dependency_plot.py rename to src/executorlib/task_scheduler/interactive/dependency_plot.py diff --git a/executorlib/task_scheduler/interactive/onetoone.py b/src/executorlib/task_scheduler/interactive/onetoone.py similarity index 100% rename from executorlib/task_scheduler/interactive/onetoone.py rename to src/executorlib/task_scheduler/interactive/onetoone.py diff --git a/executorlib/task_scheduler/interactive/shared.py b/src/executorlib/task_scheduler/interactive/shared.py similarity index 100% rename from executorlib/task_scheduler/interactive/shared.py rename to src/executorlib/task_scheduler/interactive/shared.py diff --git a/executorlib/task_scheduler/interactive/spawner_flux.py b/src/executorlib/task_scheduler/interactive/spawner_flux.py similarity index 100% rename from executorlib/task_scheduler/interactive/spawner_flux.py rename to src/executorlib/task_scheduler/interactive/spawner_flux.py diff --git a/executorlib/task_scheduler/interactive/spawner_pysqa.py b/src/executorlib/task_scheduler/interactive/spawner_pysqa.py similarity index 100% rename from executorlib/task_scheduler/interactive/spawner_pysqa.py rename to src/executorlib/task_scheduler/interactive/spawner_pysqa.py diff --git a/executorlib/task_scheduler/interactive/spawner_slurm.py b/src/executorlib/task_scheduler/interactive/spawner_slurm.py similarity index 100% rename from executorlib/task_scheduler/interactive/spawner_slurm.py rename to src/executorlib/task_scheduler/interactive/spawner_slurm.py diff --git a/tests/test_standalone_interactive_communication.py b/tests/test_standalone_interactive_communication.py index a644a42d..c1303068 100644 --- a/tests/test_standalone_interactive_communication.py +++ b/tests/test_standalone_interactive_communication.py @@ -49,6 +49,7 @@ def test_interface_mpi(self): __file__, "..", "..", + "src", "executorlib", "backend", "interactive_parallel.py", @@ -79,6 +80,7 @@ def test_interface_serial_without_debug(self): __file__, "..", "..", + "src", "executorlib", "backend", "interactive_serial.py", @@ -109,6 +111,7 @@ def test_interface_serial_with_debug(self): __file__, "..", "..", + "src", "executorlib", "backend", "interactive_serial.py", @@ -170,6 +173,7 @@ def test_interface_serial_with_stopped_process(self): __file__, "..", "..", + "src", "executorlib", "backend", "interactive_serial.py",