From f5dacbc0ede53dddd0bdf01cb9f01923cf05d8d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 15:41:58 +0000 Subject: [PATCH 1/3] Bump pympipool from 0.8.5 to 0.9.1 Bumps [pympipool](https://github.com/pyiron/executorlib) from 0.8.5 to 0.9.1. - [Release notes](https://github.com/pyiron/executorlib/releases) - [Commits](https://github.com/pyiron/executorlib/commits) --- updated-dependencies: - dependency-name: pympipool dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 90a9c68..e20f778 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ remote = [ "tqdm==4.66.4", ] executor = [ - "pympipool==0.8.5", + "pympipool==0.9.1", "cloudpickle==3.0.0", ] twofactor = ["pyauthenticator==0.2.0"] From 2601f40150848237b376b39c0d3dbfb255b25907 Mon Sep 17 00:00:00 2001 From: pyironrunner Date: Mon, 15 Jul 2024 15:42:14 +0000 Subject: [PATCH 2/3] [dependabot skip] Update environment --- .ci_support/environment-docs.yml | 2 +- .ci_support/environment.yml | 2 +- binder/environment.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index 2ba772e..b88fcda 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -11,6 +11,6 @@ dependencies: - jinja2 =3.1.4 - paramiko =3.4.0 - tqdm =4.66.4 -- pympipool =0.8.5 +- pympipool =0.9.1 - cloudpickle =3.0.0 - jupyter-book =1.0.0 diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index 1e87ba4..14e3e48 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -8,5 +8,5 @@ dependencies: - jinja2 =3.1.4 - paramiko =3.4.0 - tqdm =4.66.4 -- pympipool =0.8.5 +- pympipool =0.9.1 - cloudpickle =3.0.0 diff --git a/binder/environment.yml b/binder/environment.yml index fd12314..e7cbd53 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -8,7 +8,7 @@ dependencies: - jinja2 =3.1.4 - paramiko =3.4.0 - tqdm =4.66.4 -- pympipool =0.8.5 +- pympipool =0.9.1 - cloudpickle =3.0.0 - flux-core =0.59.0 - versioneer =0.28 From c389755420e9da18926665308ed875c27cc83a6c Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 15 Jul 2024 18:08:14 +0200 Subject: [PATCH 3/3] Switch to executorlib --- .ci_support/environment-docs.yml | 2 +- .ci_support/environment-old.yml | 2 +- .ci_support/environment.yml | 2 +- binder/environment.yml | 2 +- binder/postBuild | 2 +- pyproject.toml | 2 +- pysqa/executor/backend.py | 2 +- pysqa/executor/executor.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index b88fcda..b0f12e2 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -11,6 +11,6 @@ dependencies: - jinja2 =3.1.4 - paramiko =3.4.0 - tqdm =4.66.4 -- pympipool =0.9.1 +- executorlib =0.0.1 - cloudpickle =3.0.0 - jupyter-book =1.0.0 diff --git a/.ci_support/environment-old.yml b/.ci_support/environment-old.yml index ca784cb..4d9a10a 100644 --- a/.ci_support/environment-old.yml +++ b/.ci_support/environment-old.yml @@ -7,5 +7,5 @@ dependencies: - jinja2 =2.11.3 - paramiko =2.7.1 - tqdm =4.66.1 -- pympipool =0.8.0 +- executorlib =0.0.1 - cloudpickle =2.2.1 diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index 14e3e48..ef008c1 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -8,5 +8,5 @@ dependencies: - jinja2 =3.1.4 - paramiko =3.4.0 - tqdm =4.66.4 -- pympipool =0.9.1 +- executorlib =0.0.1 - cloudpickle =3.0.0 diff --git a/binder/environment.yml b/binder/environment.yml index e7cbd53..6844e66 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -8,7 +8,7 @@ dependencies: - jinja2 =3.1.4 - paramiko =3.4.0 - tqdm =4.66.4 -- pympipool =0.9.1 +- executorlib =0.0.1 - cloudpickle =3.0.0 - flux-core =0.59.0 - versioneer =0.28 diff --git a/binder/postBuild b/binder/postBuild index 95729c6..3d4f35e 100644 --- a/binder/postBuild +++ b/binder/postBuild @@ -2,7 +2,7 @@ mkdir -p /home/jovyan/.local/share/jupyter/kernels/flux cp binder/kernel.json /home/jovyan/.local/share/jupyter/kernels/flux -# install pympipool +# install pysqa pip install . --no-deps --no-build-isolation # copy notebooks diff --git a/pyproject.toml b/pyproject.toml index e20f778..5c3c3d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ remote = [ "tqdm==4.66.4", ] executor = [ - "pympipool==0.9.1", + "executorlib==0.0.1", "cloudpickle==3.0.0", ] twofactor = ["pyauthenticator==0.2.0"] diff --git a/pysqa/executor/backend.py b/pysqa/executor/backend.py index 192c68a..06c2962 100644 --- a/pysqa/executor/backend.py +++ b/pysqa/executor/backend.py @@ -2,7 +2,7 @@ import sys from typing import Optional -from pympipool import Executor +from executorlib import Executor from pysqa.executor.helper import ( deserialize, diff --git a/pysqa/executor/executor.py b/pysqa/executor/executor.py index 514e774..9070a8c 100644 --- a/pysqa/executor/executor.py +++ b/pysqa/executor/executor.py @@ -4,7 +4,7 @@ from concurrent.futures import Future from typing import Optional -from pympipool.shared import RaisingThread, cancel_items_in_queue +from executorlib.shared import RaisingThread, cancel_items_in_queue from pysqa.executor.helper import ( find_executed_tasks,