Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump executorlib from 0.0.10 to 0.1.0 #1748

Merged
merged 4 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- pyfileindex =0.0.33
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.4
- executorlib =0.0.10
- executorlib =0.1.0
- pysqa =0.2.3
- pytables =3.10.2
- sqlalchemy =2.0.37
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/environment-mini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- pyfileindex =0.0.33
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.3
- executorlib =0.0.10
- executorlib =0.1.0
- pysqa =0.2.3
- pytables =3.10.2
- sqlalchemy =2.0.37
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/environment-old.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- pyfileindex =0.0.16
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.3
- executorlib =0.0.1
- executorlib =0.1.0
- pysqa =0.1.12
- pytables =3.6.1
- sqlalchemy =2.0.22
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- pyfileindex =0.0.33
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.4
- executorlib =0.0.10
- executorlib =0.1.0
- pysqa =0.2.3
- pytables =3.10.2
- sqlalchemy =2.0.37
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- pyfileindex =0.0.33
- pyiron_dataclasses =0.0.1
- pyiron_snippets =0.1.4
- executorlib =0.0.10
- executorlib =0.1.0
- pysqa =0.2.3
- pytables =3.10.2
- sqlalchemy =2.0.37
Expand Down
2 changes: 1 addition & 1 deletion pyiron_base/jobs/datamining.py
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ def update_table(self, job_status_list: Optional[List[str]] = None) -> None:
self.project.db.item_update({"timestart": datetime.now()}, self.job_id)
with self.project_hdf5.open("input") as hdf5_input:
if self._executor_type is None and self.server.cores > 1:
self._executor_type = "executorlib.Executor"
self._executor_type = "executorlib.SingleNodeExecutor"
if self._executor_type is not None:
with self._get_executor(max_workers=self.server.cores) as exe:
self._pyiron_table.create_table(
Expand Down
4 changes: 2 additions & 2 deletions pyiron_base/jobs/job/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1680,14 +1680,14 @@ def _get_executor(self, max_workers: Optional[int] = None) -> Executor:
"No executor type defined - Please set self.executor_type."
)
elif (
self._executor_type == "executorlib.Executor"
self._executor_type == "executorlib.SingleNodeExecutor"
and platform.system() == "Darwin"
):
# The Mac firewall might prevent connections based on the network address - especially Github CI
return import_class(self._executor_type)(
max_cores=max_workers, hostname_localhost=True
)
elif self._executor_type == "executorlib.Executor":
elif self._executor_type == "executorlib.SingleNodeExecutor":
# The executorlib Executor defines max_cores rather than max_workers
return import_class(self._executor_type)(max_cores=max_workers)
elif isinstance(self._executor_type, str):
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
]
dependencies = [
"cloudpickle==3.1.1",
"executorlib==0.0.10",
"executorlib==0.1.0",
"h5io_browser==0.1.6",
"h5py==3.12.1",
"numpy==2.2.2",
Expand Down
Loading