Various adjustments to fix breakage after rebase
- Remove `exceptiongroup` import, - pin to py 3.11 in `setup.py` - revert any lingering `tractor.devx` imports; sub-pkg is coming in a downstream PR! - remove weird double `@property` lingering from conflict reso.. - modern `pytest` requires conftest mod mods to be relative imported.sc_super_proto_dgrams
parent
9a8cd13894
commit
11bab13a06
2
setup.py
2
setup.py
|
@ -75,7 +75,7 @@ setup(
|
|||
|
||||
],
|
||||
tests_require=['pytest'],
|
||||
python_requires=">=3.10",
|
||||
python_requires=">=3.11",
|
||||
keywords=[
|
||||
'trio',
|
||||
'async',
|
||||
|
|
|
@ -26,7 +26,7 @@ from pexpect.exceptions import (
|
|||
from tractor._testing import (
|
||||
examples_dir,
|
||||
)
|
||||
from conftest import (
|
||||
from .conftest import (
|
||||
_ci_env,
|
||||
)
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ import tractor
|
|||
from tractor._testing import (
|
||||
tractor_test,
|
||||
)
|
||||
from conftest import (
|
||||
from .conftest import (
|
||||
sig_prog,
|
||||
_INT_SIGNAL,
|
||||
_INT_RETURN_CODE,
|
||||
|
|
|
@ -18,8 +18,6 @@
|
|||
tractor: structured concurrent ``trio``-"actors".
|
||||
|
||||
"""
|
||||
from exceptiongroup import BaseExceptionGroup
|
||||
|
||||
from ._clustering import open_actor_cluster
|
||||
from ._ipc import Channel
|
||||
from ._context import (
|
||||
|
|
|
@ -313,7 +313,7 @@ async def _drain_to_final_msg(
|
|||
log.critical('SHOULD NEVER GET HERE!?')
|
||||
assert msg is ctx._cancel_msg
|
||||
assert error.msgdata == ctx._remote_error.msgdata
|
||||
from .devx._debug import pause
|
||||
from ._debug import pause
|
||||
await pause()
|
||||
ctx._maybe_cancel_and_set_remote_error(error)
|
||||
ctx._maybe_raise_remote_err(error)
|
||||
|
@ -2199,12 +2199,12 @@ async def open_context_from_portal(
|
|||
# pass
|
||||
# TODO: factor ^ into below for non-root cases?
|
||||
#
|
||||
from .devx import maybe_wait_for_debugger
|
||||
from ._debug import maybe_wait_for_debugger
|
||||
was_acquired: bool = await maybe_wait_for_debugger(
|
||||
header_msg=(
|
||||
'Delaying `ctx.cancel()` until debug lock '
|
||||
'acquired..\n'
|
||||
),
|
||||
# header_msg=(
|
||||
# 'Delaying `ctx.cancel()` until debug lock '
|
||||
# 'acquired..\n'
|
||||
# ),
|
||||
)
|
||||
if was_acquired:
|
||||
log.pdb(
|
||||
|
@ -2310,7 +2310,7 @@ async def open_context_from_portal(
|
|||
# where the root is waiting on the lock to clear but the
|
||||
# child has already cleared it and clobbered IPC.
|
||||
if debug_mode():
|
||||
from .devx import maybe_wait_for_debugger
|
||||
from ._debug import maybe_wait_for_debugger
|
||||
await maybe_wait_for_debugger()
|
||||
|
||||
# though it should be impossible for any tasks
|
||||
|
|
|
@ -55,15 +55,10 @@ from ._exceptions import (
|
|||
unpack_error,
|
||||
TransportClosed,
|
||||
)
|
||||
from .devx import (
|
||||
# pause,
|
||||
maybe_wait_for_debugger,
|
||||
_debug,
|
||||
)
|
||||
from . import _debug
|
||||
from . import _state
|
||||
from .log import get_logger
|
||||
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from ._runtime import Actor
|
||||
|
||||
|
@ -651,7 +646,7 @@ async def _invoke(
|
|||
|
||||
# don't pop the local context until we know the
|
||||
# associated child isn't in debug any more
|
||||
await maybe_wait_for_debugger()
|
||||
await _debug.maybe_wait_for_debugger()
|
||||
ctx: Context = actor._contexts.pop((
|
||||
chan.uid,
|
||||
cid,
|
||||
|
|
|
@ -1318,7 +1318,6 @@ class Actor:
|
|||
log.runtime("Shutting down channel server")
|
||||
self._server_n.cancel_scope.cancel()
|
||||
|
||||
@property
|
||||
@property
|
||||
def accept_addr(self) -> tuple[str, int]:
|
||||
'''
|
||||
|
|
Loading…
Reference in New Issue