Skip to content

Commit cff69d3

Browse files
committed
bind and test against the corresponded rmq-out branch of unkcpz/plumpy changes
1 parent d5733b2 commit cff69d3

File tree

7 files changed

+14
-16
lines changed

7 files changed

+14
-16
lines changed

pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies = [
3434
'importlib-metadata~=6.0',
3535
'numpy~=1.21',
3636
'paramiko~=3.0',
37-
'plumpy~=0.22.3',
37+
'plumpy',
3838
'pgsu~=0.3.0',
3939
'psutil~=5.6',
4040
'psycopg[binary]~=3.0',
@@ -246,6 +246,7 @@ tests = [
246246
'pympler~=1.0',
247247
'coverage~=7.0',
248248
'sphinx~=7.2.0',
249+
'watchdog~=6.0',
249250
'docutils~=0.20'
250251
]
251252
tui = [
@@ -510,3 +511,6 @@ passenv =
510511
AIIDA_TEST_WORKERS
511512
commands = molecule {posargs:test}
512513
"""
514+
515+
[tool.uv.sources]
516+
plumpy = {git = "https://github.com/unkcpz/plumpy", branch = "rmq-out"}

src/aiida/engine/processes/launcher.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def handle_continue_exception(node, exception, message):
3838
node.set_process_state(ProcessState.EXCEPTED)
3939
node.seal()
4040

41-
4241
async def _continue(self, pid, nowait, tag=None):
4342
"""Continue the task.
4443

src/aiida/engine/runners.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
from typing import Any, Callable, Dict, NamedTuple, Optional, Tuple, Type, Union
2020

2121
import kiwipy
22-
from plumpy.rmq import wrap_communicator
2322
from plumpy.events import reset_event_loop_policy, set_event_loop_policy
2423
from plumpy.persistence import Persister
25-
from plumpy.rmq import RemoteProcessThreadController
24+
from plumpy.rmq import RemoteProcessThreadController, wrap_communicator
2625

2726
from aiida.common import exceptions
2827
from aiida.orm import ProcessNode, load_node

src/aiida/tools/pytest_fixtures/daemon.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ def test(started_daemon_client):
6363
daemon_client.start_daemon()
6464
assert daemon_client.is_daemon_running
6565

66-
import time
6766
import threading
67+
import time
68+
69+
from watchdog.events import FileSystemEventHandler
70+
6871
# XXX: watchdog and pytest-timeout as extra deps of tests
6972
from watchdog.observers import Observer
70-
from watchdog.events import FileSystemEventHandler
7173

72-
logger = logging.getLogger("tests.daemon:started_daemon_client")
74+
logger = logging.getLogger('tests.daemon:started_daemon_client')
7375

7476
logger.debug(f'Daemon log file is located at: {daemon_client.daemon_log_file}')
7577

@@ -105,7 +107,6 @@ def print_log_content(check_interval=0.1):
105107
observer.stop()
106108
observer.join()
107109

108-
109110
# Start a background thread to continuously print new log lines
110111
t = threading.Thread(target=print_log_content, daemon=True)
111112
t.start()

tests/engine/test_launch.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from aiida import orm
1717
from aiida.common import exceptions
1818
from aiida.engine import CalcJob, Process, WorkChain, calcfunction, launch
19-
from aiida.engine.daemon.client import get_daemon_client
2019
from aiida.plugins import CalculationFactory
2120

2221
ArithmeticAddCalculation = CalculationFactory('core.arithmetic.add')

tests/engine/test_runners.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import asyncio
1212
import threading
1313

14-
import plumpy
1514
import pytest
1615

1716
from aiida.calculations.arithmetic.add import ArithmeticAddCalculation

uv.lock

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)