diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index eb19767..18a98e9 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -3,4 +3,4 @@ channels: dependencies: - coverage - conda =24.9.1 -- executorlib =0.0.4 +- executorlib =0.0.5 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7526dba..0c7afc1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -27,7 +27,7 @@ jobs: run: | pip install versioneer[toml]==0.29 pip install . --no-deps --no-build-isolation - conda create -y -n py312 python=3.12.1 conda=24.7.1 executorlib=0.0.2 + conda create -y -n py312 python=3.12.1 conda=24.7.1 executorlib=0.0.5 conda activate py312 pip install versioneer[toml]==0.29 pip install . --no-deps --no-build-isolation diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 8707c23..d3054ca 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -48,7 +48,7 @@ jobs: run: | pip install versioneer[toml]==0.29 pip install . --no-deps --no-build-isolation - conda create -y -n py312 python=3.12.1 conda=24.7.1 executorlib=0.0.2 + conda create -y -n py312 python=3.12.1 conda=24.7.1 executorlib=0.0.5 conda activate py312 pip install versioneer[toml]==0.29 pip install . --no-deps --no-build-isolation diff --git a/conda_subprocess/decorator.py b/conda_subprocess/decorator.py index da76616..1ccbbb8 100644 --- a/conda_subprocess/decorator.py +++ b/conda_subprocess/decorator.py @@ -3,9 +3,9 @@ from socket import gethostname from typing import Optional -from executorlib.shared.communication import SocketInterface -from executorlib.shared.executor import get_command_path -from executorlib.shared.spawner import SubprocessSpawner +from executorlib.standalone.command import get_command_path +from executorlib.standalone.interactive.communication import SocketInterface +from executorlib.standalone.interactive.spawner import SubprocessSpawner from conda_subprocess.process import Popen diff --git a/pyproject.toml b/pyproject.toml index 5eacb41..661cd82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ Repository = "https://github.com/pyiron/conda_subprocess" [project.optional-dependencies] executorlib = [ - "executorlib==0.0.4", + "executorlib==0.0.5", ] [tool.setuptools.packages.find] diff --git a/tests/test_conda_function.py b/tests/test_conda_function.py index 4c4676e..a6c4351 100644 --- a/tests/test_conda_function.py +++ b/tests/test_conda_function.py @@ -4,7 +4,7 @@ try: from conda_subprocess.decorator import conda from executorlib import Executor - from executorlib.shared.executor import cloudpickle_register + from executorlib.standalone.serialize import cloudpickle_register except ImportError: def conda(prefix_name=None, prefix_path=None):