Skip to content

Commit

Permalink
Merge pull request #49 from pyiron/dependabot/pip/executorlib-0.0.5
Browse files Browse the repository at this point in the history
Bump executorlib from 0.0.4 to 0.0.5
  • Loading branch information
jan-janssen authored Nov 25, 2024
2 parents 1098ee3 + 0fc32f6 commit 2514df9
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ channels:
dependencies:
- coverage
- conda =24.9.1
- executorlib =0.0.4
- executorlib =0.0.5
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions conda_subprocess/decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_conda_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 2514df9

Please sign in to comment.