From 8c95560f5b06f52899b96e5d79a1f9df211123fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:51:21 +0000 Subject: [PATCH 1/7] Bump executorlib from 0.0.4 to 0.0.5 Bumps [executorlib](https://github.com/pyiron/executorlib) from 0.0.4 to 0.0.5. - [Release notes](https://github.com/pyiron/executorlib/releases) - [Commits](https://github.com/pyiron/executorlib/compare/executorlib-0.0.4...executorlib-0.0.5) --- updated-dependencies: - dependency-name: executorlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] From 338eef42bcd6a4f1cd7c6047ceab53b3eb010f93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:51:35 +0000 Subject: [PATCH 2/7] [dependabot skip] Update environment --- .ci_support/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 43b622499a518215aaea57b6dfb855de5db14e72 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 25 Nov 2024 14:20:45 +0100 Subject: [PATCH 3/7] Update test_conda_function.py --- tests/test_conda_function.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): From c20d9392c0a9f8df8029cbd48842e7012b63a3b2 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 25 Nov 2024 14:24:27 +0100 Subject: [PATCH 4/7] Update decorator.py --- conda_subprocess/decorator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda_subprocess/decorator.py b/conda_subprocess/decorator.py index da76616..de7b2b4 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.interactive.communication import SocketInterface +from executorlib.standalone.command import get_command_path +from executorlib.standalone.interactive.spawner import SubprocessSpawner from conda_subprocess.process import Popen From 4d07ec186f5510dd1f983c13845de4a5b59f95b8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:24:32 +0000 Subject: [PATCH 5/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- conda_subprocess/decorator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_subprocess/decorator.py b/conda_subprocess/decorator.py index de7b2b4..1ccbbb8 100644 --- a/conda_subprocess/decorator.py +++ b/conda_subprocess/decorator.py @@ -3,8 +3,8 @@ from socket import gethostname from typing import Optional -from executorlib.standalone.interactive.communication import SocketInterface 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 From 690070215098551fd755a44ef94b0f29056a0749 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 25 Nov 2024 14:40:28 +0100 Subject: [PATCH 6/7] Update coverage.yml --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0fc32f69f8196400d1e2d158028d2299aa1ee32e Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 25 Nov 2024 14:40:44 +0100 Subject: [PATCH 7/7] Update unittests.yml --- .github/workflows/unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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