From d83242fde71fda78f57a2d7f7fc09ba2314a4ee8 Mon Sep 17 00:00:00 2001 From: Ganden Schaffner Date: Tue, 8 Nov 2022 00:00:00 -0800 Subject: [PATCH 01/91] Test host loop calling start_soon(needs_sniffio) during a guest run --- trio/_core/tests/test_guest_mode.py | 80 +++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/trio/_core/tests/test_guest_mode.py b/trio/_core/tests/test_guest_mode.py index a5d6d78e18..ccb11a53a4 100644 --- a/trio/_core/tests/test_guest_mode.py +++ b/trio/_core/tests/test_guest_mode.py @@ -316,26 +316,38 @@ async def abandoned_main(in_host): trio.current_time() -def aiotrio_run(trio_fn, *, pass_not_threadsafe=True, **start_guest_run_kwargs): - loop = asyncio.new_event_loop() +async def start_guest_run_on_aio( + trio_fn, *, pass_not_threadsafe=True, **start_guest_run_kwargs +): + # This is asynchronous because asyncio documents that get_running_loop() + # can't be used from a sync function. + loop = asyncio.get_running_loop() + trio_done_fut = loop.create_future() - async def aio_main(): - trio_done_fut = loop.create_future() + def trio_done_callback(main_outcome): + print(f"trio_fn finished: {main_outcome!r}") + trio_done_fut.set_result(main_outcome) + + if pass_not_threadsafe: + start_guest_run_kwargs["run_sync_soon_not_threadsafe"] = loop.call_soon + + trio.lowlevel.start_guest_run( + trio_fn, + run_sync_soon_threadsafe=loop.call_soon_threadsafe, + done_callback=trio_done_callback, + **start_guest_run_kwargs, + ) - def trio_done_callback(main_outcome): - print(f"trio_fn finished: {main_outcome!r}") - trio_done_fut.set_result(main_outcome) + return trio_done_fut - if pass_not_threadsafe: - start_guest_run_kwargs["run_sync_soon_not_threadsafe"] = loop.call_soon - trio.lowlevel.start_guest_run( - trio_fn, - run_sync_soon_threadsafe=loop.call_soon_threadsafe, - done_callback=trio_done_callback, - **start_guest_run_kwargs, - ) +def aiotrio_run(trio_fn, *, pass_not_threadsafe=True, **start_guest_run_kwargs): + loop = asyncio.new_event_loop() + async def aio_main(): + trio_done_fut = await start_guest_run_on_aio( + trio_fn, pass_not_threadsafe=pass_not_threadsafe, **start_guest_run_kwargs + ) return (await trio_done_fut).unwrap() try: @@ -544,3 +556,41 @@ async def trio_main(): context.run(aiotrio_run, trio_main, host_uses_signal_set_wakeup_fd=True) assert record == {("asyncio", "asyncio"), ("trio", "trio")} + + +def test_guest_mode_host_calls_start_soon_sniffio(): + import sniffio + + async def aio_main(): + nursery = None + nursery_ready = asyncio.Event() + wait_in_nursery_done = asyncio.Event() + + async def wait_in_nursery(): + nonlocal nursery + try: + async with trio.open_nursery() as nursery: + nursery_ready.set() + await trio.sleep_forever() + finally: + wait_in_nursery_done.set() + + async def needs_sniffio(): + sniffio.current_async_library() + wait_in_nursery_done.set() + + wait_in_nursery_outcome_fut = await start_guest_run_on_aio( + wait_in_nursery, + # Not all versions of asyncio we test on use signal.set_wakeup_fd, + # but this test doesn't care about signal handling, and without + # host_uses_signal_set_wakeup_fd=True it can hang forever on some + # asyncio versions. + host_uses_signal_set_wakeup_fd=True, + ) + await nursery_ready.wait() + nursery.start_soon(needs_sniffio) + await wait_in_nursery_done.wait() + nursery.cancel_scope.cancel() + (await wait_in_nursery_outcome_fut).unwrap() + + asyncio.run(aio_main()) From 977a71c63ce810e67aed0a45e9029ee2ad6657c1 Mon Sep 17 00:00:00 2001 From: Ganden Schaffner Date: Fri, 4 Nov 2022 00:00:00 -0700 Subject: [PATCH 02/91] Fix nursery crashing during a guest run when the host loop calls start_soon(needs_sniffio) --- newsfragments/2183.bugfix.rst | 1 + trio/_core/_run.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 newsfragments/2183.bugfix.rst diff --git a/newsfragments/2183.bugfix.rst b/newsfragments/2183.bugfix.rst new file mode 100644 index 0000000000..d4f7558cd1 --- /dev/null +++ b/newsfragments/2183.bugfix.rst @@ -0,0 +1 @@ +Fixed nurseries crashing during a guest run when the host loop calls ``nursery.start_soon`` on a function that needs `sniffio `__. diff --git a/trio/_core/_run.py b/trio/_core/_run.py index be0497b635..d5c42b9feb 100644 --- a/trio/_core/_run.py +++ b/trio/_core/_run.py @@ -1530,11 +1530,21 @@ def spawn_impl( if nursery is None: assert self.init_task is None + ###### + # Propagate contextvars, and make sure that async_fn can use sniffio. + ###### + if context is None: + if system_task: + context = self.system_context.copy() + else: + context = copy_context() + context.run(current_async_library_cvar.set, "trio") + ###### # Call the function and get the coroutine object, while giving helpful # errors for common mistakes. ###### - coro = coroutine_or_error(async_fn, *args) + coro = context.run(coroutine_or_error, async_fn, *args) if name is None: name = async_fn @@ -1546,12 +1556,6 @@ def spawn_impl( except AttributeError: name = repr(name) - if context is None: - if system_task: - context = self.system_context.copy() - else: - context = copy_context() - if not hasattr(coro, "cr_frame"): # This async function is implemented in C or Cython async def python_wrapper(orig_coro): @@ -1680,7 +1684,6 @@ def spawn_system_task(self, async_fn, *args, name=None, context=None): Task: the newly spawned task """ - current_async_library_cvar.set("trio") return self.spawn_impl( async_fn, args, @@ -1931,7 +1934,6 @@ def setup_runner( instruments = Instruments(instruments) io_manager = TheIOManager() system_context = copy_context() - system_context.run(current_async_library_cvar.set, "trio") ki_manager = KIManager() runner = Runner( From d3e58bf78383e29fa078ed92c7f57f597466cf79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 10:17:34 +0000 Subject: [PATCH 03/91] Bump wcwidth from 0.2.5 to 0.2.6 Bumps [wcwidth](https://github.com/jquast/wcwidth) from 0.2.5 to 0.2.6. - [Release notes](https://github.com/jquast/wcwidth/releases) - [Commits](https://github.com/jquast/wcwidth/compare/0.2.5...0.2.6) --- updated-dependencies: - dependency-name: wcwidth dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 6a8decd7f2..b3a8dc0ff3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -124,7 +124,7 @@ typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in # mypy -wcwidth==0.2.5 +wcwidth==0.2.6 # via prompt-toolkit wrapt==1.14.1 # via astroid From 40d745a21ecb4519e50e8b89ee7a5c1924eab162 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 14:12:50 +0000 Subject: [PATCH 04/91] Bump towncrier from 22.8.0 to 22.12.0 Bumps [towncrier](https://github.com/twisted/towncrier) from 22.8.0 to 22.12.0. - [Release notes](https://github.com/twisted/towncrier/releases) - [Changelog](https://github.com/twisted/towncrier/blob/trunk/NEWS.rst) - [Commits](https://github.com/twisted/towncrier/compare/22.8.0...22.12.0) --- updated-dependencies: - dependency-name: towncrier dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs-requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index cdb4d4e9af..301426e830 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -84,9 +84,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in -tomli==2.0.1 - # via towncrier -towncrier==22.8.0 +towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 # via requests From f087ec6dc3e070e897dfbd76977bc9abf7d06965 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 10:05:34 +0000 Subject: [PATCH 05/91] Bump types-pyopenssl from 23.0.0.1 to 23.0.0.2 Bumps [types-pyopenssl](https://github.com/python/typeshed) from 23.0.0.1 to 23.0.0.2. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pyopenssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index a08f3b0b8e..bb80246d38 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -118,7 +118,7 @@ traitlets==5.8.1 # matplotlib-inline trustme==0.9.0 # via -r test-requirements.in -types-pyopenssl==23.0.0.1 ; implementation_name == "cpython" +types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" # via -r test-requirements.in typing-extensions==4.4.0 ; implementation_name == "cpython" # via From 5a3144ede823c45c4fcb6328af31a85d3bd785b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 10:13:31 +0000 Subject: [PATCH 06/91] Bump pylint from 2.14.5 to 2.15.10 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.14.5 to 2.15.10. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Commits](https://github.com/PyCQA/pylint/compare/v2.14.5...v2.15.10) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index bb80246d38..adbaa8e2fb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,7 @@ # astor==0.8.1 # via -r test-requirements.in -astroid==2.11.7 +astroid==2.13.3 # via pylint async-generator==1.10 # via -r test-requirements.in @@ -96,7 +96,7 @@ pyflakes==2.4.0 # via flake8 pygments==2.14.0 # via ipython -pylint==2.14.5 +pylint==2.15.10 # via -r test-requirements.in pyopenssl==23.0.0 # via -r test-requirements.in From 90b688cc7cfc0ed13010a1731c62f0a0e3ed3587 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 10:11:51 +0000 Subject: [PATCH 07/91] Bump astroid from 2.13.3 to 2.13.5 Bumps [astroid](https://github.com/PyCQA/astroid) from 2.13.3 to 2.13.5. - [Release notes](https://github.com/PyCQA/astroid/releases) - [Changelog](https://github.com/PyCQA/astroid/blob/main/ChangeLog) - [Commits](https://github.com/PyCQA/astroid/compare/v2.13.3...v2.13.5) --- updated-dependencies: - dependency-name: astroid dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index adbaa8e2fb..6a479f7c7b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,7 @@ # astor==0.8.1 # via -r test-requirements.in -astroid==2.13.3 +astroid==2.13.5 # via pylint async-generator==1.10 # via -r test-requirements.in From 8797e20bd3ed14a0cca08c450afc48d4f81f3411 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Feb 2023 10:04:53 +0000 Subject: [PATCH 08/91] Bump pylint from 2.15.10 to 2.16.0 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.15.10 to 2.16.0. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Commits](https://github.com/PyCQA/pylint/compare/v2.15.10...v2.16.0) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 6a479f7c7b..9e73b0ac77 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,7 @@ # astor==0.8.1 # via -r test-requirements.in -astroid==2.13.5 +astroid==2.14.1 # via pylint async-generator==1.10 # via -r test-requirements.in @@ -96,7 +96,7 @@ pyflakes==2.4.0 # via flake8 pygments==2.14.0 # via ipython -pylint==2.15.10 +pylint==2.16.0 # via -r test-requirements.in pyopenssl==23.0.0 # via -r test-requirements.in From 798e87a126e391073c00c54dc2a8f466986cd7f3 Mon Sep 17 00:00:00 2001 From: jakkdl Date: Sat, 28 Jan 2023 18:04:04 +0100 Subject: [PATCH 09/91] Add generic typing support for MemorySendChannel and MemoryReceiveChannel --- trio/_channel.py | 166 ++++++++++++++++++++++++++++------------- trio/_core/__init__.py | 1 + trio/_core/_traps.py | 7 +- trio/lowlevel.py | 1 + 4 files changed, 123 insertions(+), 52 deletions(-) diff --git a/trio/_channel.py b/trio/_channel.py index 1cecc55621..3fa225f2a3 100644 --- a/trio/_channel.py +++ b/trio/_channel.py @@ -1,6 +1,19 @@ +from __future__ import annotations + from collections import deque, OrderedDict +from collections.abc import Callable from math import inf +from types import TracebackType +from typing import ( + Any, + Generic, + NoReturn, + TypeVar, + TYPE_CHECKING, + Tuple, # only needed for typechecking on <3.9 +) + import attr from outcome import Error, Value @@ -8,11 +21,28 @@ from ._util import generic_function, NoPublicConstructor import trio -from ._core import enable_ki_protection +from ._core import enable_ki_protection, Task, Abort, RaiseCancelT + +# A regular invariant generic type +T = TypeVar("T") + +# The type of object produced by a ReceiveChannel (covariant because +# ReceiveChannel[Derived] can be passed to someone expecting +# ReceiveChannel[Base]) +ReceiveType = TypeVar("ReceiveType", covariant=True) + +# The type of object accepted by a SendChannel (contravariant because +# SendChannel[Base] can be passed to someone expecting +# SendChannel[Derived]) +SendType = TypeVar("SendType", contravariant=True) +# Temporary TypeVar needed until mypy release supports Self as a type +SelfT = TypeVar("SelfT") -@generic_function -def open_memory_channel(max_buffer_size): + +def _open_memory_channel( + max_buffer_size: int, +) -> tuple[MemorySendChannel[T], MemoryReceiveChannel[T]]: """Open a channel for passing objects between tasks within a process. Memory channels are lightweight, cheap to allocate, and entirely @@ -68,36 +98,57 @@ def open_memory_channel(max_buffer_size): raise TypeError("max_buffer_size must be an integer or math.inf") if max_buffer_size < 0: raise ValueError("max_buffer_size must be >= 0") - state = MemoryChannelState(max_buffer_size) + state: MemoryChannelState[T] = MemoryChannelState(max_buffer_size) return ( - MemorySendChannel._create(state), - MemoryReceiveChannel._create(state), + MemorySendChannel[T]._create(state), + MemoryReceiveChannel[T]._create(state), ) +# This workaround requires python3.9+, once older python versions are not supported +# or there's a better way of achieving type-checking on a generic factory function, +# it could replace the normal function header +if TYPE_CHECKING: + # written as a class so you can say open_memory_channel[int](5) + # Need to use Tuple instead of tuple due to CI check running on 3.8 + class open_memory_channel(Tuple[MemorySendChannel[T], MemoryReceiveChannel[T]]): + def __new__( # type: ignore[misc] # "must return a subtype" + cls, max_buffer_size: int + ) -> tuple[MemorySendChannel[T], MemoryReceiveChannel[T]]: + return _open_memory_channel(max_buffer_size) + + def __init__(self, max_buffer_size: int): + ... + +else: + # apply the generic_function decorator to make open_memory_channel indexable + # so it's valid to say e.g. ``open_memory_channel[bytes](5)`` at runtime + open_memory_channel = generic_function(_open_memory_channel) + + @attr.s(frozen=True, slots=True) class MemoryChannelStats: - current_buffer_used = attr.ib() - max_buffer_size = attr.ib() - open_send_channels = attr.ib() - open_receive_channels = attr.ib() - tasks_waiting_send = attr.ib() - tasks_waiting_receive = attr.ib() + current_buffer_used: int = attr.ib() + max_buffer_size: int = attr.ib() + open_send_channels: int = attr.ib() + open_receive_channels: int = attr.ib() + tasks_waiting_send: int = attr.ib() + tasks_waiting_receive: int = attr.ib() @attr.s(slots=True) -class MemoryChannelState: - max_buffer_size = attr.ib() - data = attr.ib(factory=deque) +class MemoryChannelState(Generic[T]): + max_buffer_size: int = attr.ib() + data: deque[T] = attr.ib(factory=deque) # Counts of open endpoints using this state - open_send_channels = attr.ib(default=0) - open_receive_channels = attr.ib(default=0) + open_send_channels: int = attr.ib(default=0) + open_receive_channels: int = attr.ib(default=0) # {task: value} - send_tasks = attr.ib(factory=OrderedDict) + send_tasks: OrderedDict[Task, T] = attr.ib(factory=OrderedDict) # {task: None} - receive_tasks = attr.ib(factory=OrderedDict) + receive_tasks: OrderedDict[Task, None] = attr.ib(factory=OrderedDict) - def statistics(self): + def statistics(self) -> MemoryChannelStats: return MemoryChannelStats( current_buffer_used=len(self.data), max_buffer_size=self.max_buffer_size, @@ -109,28 +160,28 @@ def statistics(self): @attr.s(eq=False, repr=False) -class MemorySendChannel(SendChannel, metaclass=NoPublicConstructor): - _state = attr.ib() - _closed = attr.ib(default=False) +class MemorySendChannel(SendChannel[SendType], metaclass=NoPublicConstructor): + _state: MemoryChannelState[SendType] = attr.ib() + _closed: bool = attr.ib(default=False) # This is just the tasks waiting on *this* object. As compared to # self._state.send_tasks, which includes tasks from this object and # all clones. - _tasks = attr.ib(factory=set) + _tasks: set[Task] = attr.ib(factory=set) - def __attrs_post_init__(self): + def __attrs_post_init__(self) -> None: self._state.open_send_channels += 1 - def __repr__(self): + def __repr__(self) -> str: return "".format( id(self), id(self._state) ) - def statistics(self): + def statistics(self) -> MemoryChannelStats: # XX should we also report statistics specific to this object? return self._state.statistics() @enable_ki_protection - def send_nowait(self, value): + def send_nowait(self, value: SendType) -> None: """Like `~trio.abc.SendChannel.send`, but if the channel's buffer is full, raises `WouldBlock` instead of blocking. @@ -150,7 +201,7 @@ def send_nowait(self, value): raise trio.WouldBlock @enable_ki_protection - async def send(self, value): + async def send(self, value: SendType) -> None: """See `SendChannel.send `. Memory channels allow multiple tasks to call `send` at the same time. @@ -170,15 +221,16 @@ async def send(self, value): self._state.send_tasks[task] = value task.custom_sleep_data = self - def abort_fn(_): + def abort_fn(_: RaiseCancelT) -> Abort: self._tasks.remove(task) del self._state.send_tasks[task] return trio.lowlevel.Abort.SUCCEEDED await trio.lowlevel.wait_task_rescheduled(abort_fn) + # Return type must be stringified or use a TypeVar @enable_ki_protection - def clone(self): + def clone(self) -> "MemorySendChannel[SendType]": """Clone this send channel object. This returns a new `MemorySendChannel` object, which acts as a @@ -206,14 +258,19 @@ def clone(self): raise trio.ClosedResourceError return MemorySendChannel._create(self._state) - def __enter__(self): + def __enter__(self: SelfT) -> SelfT: return self - def __exit__(self, exc_type, exc_val, exc_tb): + def __exit__( + self, + exc_type: type[BaseException] | None, + exc_val: BaseException | None, + exc_tb: TracebackType | None, + ) -> None: self.close() @enable_ki_protection - def close(self): + def close(self) -> None: """Close this send channel object synchronously. All channel objects have an asynchronous `~.AsyncResource.aclose` method. @@ -241,30 +298,30 @@ def close(self): self._state.receive_tasks.clear() @enable_ki_protection - async def aclose(self): + async def aclose(self) -> None: self.close() await trio.lowlevel.checkpoint() @attr.s(eq=False, repr=False) -class MemoryReceiveChannel(ReceiveChannel, metaclass=NoPublicConstructor): - _state = attr.ib() - _closed = attr.ib(default=False) - _tasks = attr.ib(factory=set) +class MemoryReceiveChannel(ReceiveChannel[ReceiveType], metaclass=NoPublicConstructor): + _state: MemoryChannelState[ReceiveType] = attr.ib() + _closed: bool = attr.ib(default=False) + _tasks: set[trio._core._run.Task] = attr.ib(factory=set) - def __attrs_post_init__(self): + def __attrs_post_init__(self) -> None: self._state.open_receive_channels += 1 - def statistics(self): + def statistics(self) -> MemoryChannelStats: return self._state.statistics() - def __repr__(self): + def __repr__(self) -> str: return "".format( id(self), id(self._state) ) @enable_ki_protection - def receive_nowait(self): + def receive_nowait(self) -> ReceiveType: """Like `~trio.abc.ReceiveChannel.receive`, but if there's nothing ready to receive, raises `WouldBlock` instead of blocking. @@ -284,7 +341,7 @@ def receive_nowait(self): raise trio.WouldBlock @enable_ki_protection - async def receive(self): + async def receive(self) -> ReceiveType: """See `ReceiveChannel.receive `. Memory channels allow multiple tasks to call `receive` at the same @@ -306,15 +363,17 @@ async def receive(self): self._state.receive_tasks[task] = None task.custom_sleep_data = self - def abort_fn(_): + def abort_fn(_: RaiseCancelT) -> Abort: self._tasks.remove(task) del self._state.receive_tasks[task] return trio.lowlevel.Abort.SUCCEEDED - return await trio.lowlevel.wait_task_rescheduled(abort_fn) + # Not strictly guaranteed to return ReceiveType, but will do so unless + # you intentionally reschedule with a bad value. + return await trio.lowlevel.wait_task_rescheduled(abort_fn) # type: ignore[no-any-return] @enable_ki_protection - def clone(self): + def clone(self) -> "MemoryReceiveChannel[ReceiveType]": """Clone this receive channel object. This returns a new `MemoryReceiveChannel` object, which acts as a @@ -345,14 +404,19 @@ def clone(self): raise trio.ClosedResourceError return MemoryReceiveChannel._create(self._state) - def __enter__(self): + def __enter__(self: SelfT) -> SelfT: return self - def __exit__(self, exc_type, exc_val, exc_tb): + def __exit__( + self, + exc_type: type[BaseException] | None, + exc_val: BaseException | None, + exc_tb: TracebackType | None, + ) -> None: self.close() @enable_ki_protection - def close(self): + def close(self) -> None: """Close this receive channel object synchronously. All channel objects have an asynchronous `~.AsyncResource.aclose` method. @@ -381,6 +445,6 @@ def close(self): self._state.data.clear() @enable_ki_protection - async def aclose(self): + async def aclose(self) -> None: self.close() await trio.lowlevel.checkpoint() diff --git a/trio/_core/__init__.py b/trio/_core/__init__.py index 8e3e526cfe..f9919b8323 100644 --- a/trio/_core/__init__.py +++ b/trio/_core/__init__.py @@ -55,6 +55,7 @@ from ._traps import ( cancel_shielded_checkpoint, Abort, + RaiseCancelT, wait_task_rescheduled, temporarily_detach_coroutine_object, permanently_detach_coroutine_object, diff --git a/trio/_core/_traps.py b/trio/_core/_traps.py index 95cf46de9b..39481c5903 100644 --- a/trio/_core/_traps.py +++ b/trio/_core/_traps.py @@ -8,6 +8,7 @@ from . import _run +from typing import Callable, NoReturn, Any # Helper for the bottommost 'yield'. You can't use 'yield' inside an async # function, but you can inside a generator, and if you decorate your generator @@ -64,7 +65,11 @@ class WaitTaskRescheduled: abort_func = attr.ib() -async def wait_task_rescheduled(abort_func): +RaiseCancelT = Callable[[], NoReturn] # TypeAlias + +# Should always return the type a Task "expects", unless you willfully reschedule it +# with a bad value. +async def wait_task_rescheduled(abort_func: Callable[[RaiseCancelT], Abort]) -> Any: """Put the current task to sleep, with cancellation support. This is the lowest-level API for blocking in Trio. Every time a diff --git a/trio/lowlevel.py b/trio/lowlevel.py index f30fdcc4bd..004692475f 100644 --- a/trio/lowlevel.py +++ b/trio/lowlevel.py @@ -16,6 +16,7 @@ from ._core import ( cancel_shielded_checkpoint, Abort, + RaiseCancelT, wait_task_rescheduled, enable_ki_protection, disable_ki_protection, From 323973f56fd2edf0f61fe895eb5a14f8a38508bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 10:17:31 +0000 Subject: [PATCH 10/91] Bump platformdirs from 2.6.0 to 3.0.0 Bumps [platformdirs](https://github.com/platformdirs/platformdirs) from 2.6.0 to 3.0.0. - [Release notes](https://github.com/platformdirs/platformdirs/releases) - [Changelog](https://github.com/platformdirs/platformdirs/blob/main/CHANGES.rst) - [Commits](https://github.com/platformdirs/platformdirs/compare/2.6.0...3.0.0) --- updated-dependencies: - dependency-name: platformdirs dependency-type: indirect update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 9e73b0ac77..d067abf15a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -78,7 +78,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -platformdirs==2.6.0 +platformdirs==3.0.0 # via # black # pylint From 54b4940f0deb9892d730c43dc3201fd8a18bf817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 14:50:39 +0000 Subject: [PATCH 11/91] Bump sphinxcontrib-applehelp from 1.0.2 to 1.0.4 Bumps [sphinxcontrib-applehelp](https://github.com/sphinx-doc/sphinxcontrib-applehelp) from 1.0.2 to 1.0.4. - [Release notes](https://github.com/sphinx-doc/sphinxcontrib-applehelp/releases) - [Changelog](https://github.com/sphinx-doc/sphinxcontrib-applehelp/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinxcontrib-applehelp/compare/1.0.2...1.0.4) --- updated-dependencies: - dependency-name: sphinxcontrib-applehelp dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index cdb4d4e9af..7a93ab9f68 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -70,7 +70,7 @@ sphinx==3.3.1 # sphinxcontrib-trio sphinx-rtd-theme==1.1.1 # via -r docs-requirements.in -sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx From b1a18078ac5a4e3eff302388678f0b13318c6aad Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Tue, 7 Feb 2023 14:59:49 +0000 Subject: [PATCH 12/91] Bump Python version for RTD --- .readthedocs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 2a32d6c9b5..9fde00ef8f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,8 +5,12 @@ formats: - htmlzip - epub +build: + os: "ubuntu-22.04" + tools: + python: "3.11" + python: - version: 3.7 install: - requirements: docs-requirements.txt From d27e97c096ca35887e0aaf02e4cea45b48349e35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 02:11:45 +0000 Subject: [PATCH 13/91] Bump cryptography from 39.0.0 to 39.0.1 Bumps [cryptography](https://github.com/pyca/cryptography) from 39.0.0 to 39.0.1. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/39.0.0...39.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index d067abf15a..166f05a546 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -25,7 +25,7 @@ click==8.1.3 # via black coverage[toml]==6.4.1 # via pytest-cov -cryptography==39.0.0 +cryptography==39.0.1 # via # -r test-requirements.in # pyopenssl From 838ae9bb87ce7edf55dea66595cfc90f7bda0d45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 02:12:15 +0000 Subject: [PATCH 14/91] Bump sphinxcontrib-htmlhelp from 2.0.0 to 2.0.1 Bumps [sphinxcontrib-htmlhelp](https://github.com/sphinx-doc/sphinxcontrib-htmlhelp) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/releases) - [Changelog](https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/commits) --- updated-dependencies: - dependency-name: sphinxcontrib-htmlhelp dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 7a93ab9f68..9f669af4a3 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -74,7 +74,7 @@ sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx From 10ad6f60adaf466ce966ed02b45e2414bfc5ef98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 03:09:56 +0000 Subject: [PATCH 15/91] Bump prompt-toolkit from 3.0.33 to 3.0.36 Bumps [prompt-toolkit](https://github.com/prompt-toolkit/python-prompt-toolkit) from 3.0.33 to 3.0.36. - [Release notes](https://github.com/prompt-toolkit/python-prompt-toolkit/releases) - [Changelog](https://github.com/prompt-toolkit/python-prompt-toolkit/blob/master/CHANGELOG) - [Commits](https://github.com/prompt-toolkit/python-prompt-toolkit/compare/3.0.33...3.0.36) --- updated-dependencies: - dependency-name: prompt-toolkit dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 0f989caca3..60981ad92c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -84,7 +84,7 @@ platformdirs==3.0.0 # pylint pluggy==1.0.0 # via pytest -prompt-toolkit==3.0.33 +prompt-toolkit==3.0.36 # via ipython ptyprocess==0.7.0 # via pexpect From 558f61c95945e9924a0ec3e438326c21e7dca7d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:08:24 +0000 Subject: [PATCH 16/91] Bump pylint from 2.16.0 to 2.16.1 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.16.0 to 2.16.1. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Commits](https://github.com/PyCQA/pylint/compare/v2.16.0...v2.16.1) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 60981ad92c..5a7afe8045 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -96,7 +96,7 @@ pyflakes==2.4.0 # via flake8 pygments==2.14.0 # via ipython -pylint==2.16.0 +pylint==2.16.1 # via -r test-requirements.in pyopenssl==23.0.0 # via -r test-requirements.in From f69c595eec90d8417f58352b490b502d32508790 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:12:03 +0000 Subject: [PATCH 17/91] Bump mypy from 0.991 to 1.0.0 Bumps [mypy](https://github.com/python/mypy) from 0.991 to 1.0.0. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.991...v1.0.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 60981ad92c..7408bedbdc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -59,7 +59,7 @@ mccabe==0.6.1 # via # flake8 # pylint -mypy==0.991 ; implementation_name == "cpython" +mypy==1.0.0 ; implementation_name == "cpython" # via -r test-requirements.in mypy-extensions==0.4.3 ; implementation_name == "cpython" # via From 5d904c465c40562b9e7b9bb95b64c712fccbcf1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:15:18 +0000 Subject: [PATCH 18/91] Bump mypy-extensions from 0.4.3 to 1.0.0 Bumps [mypy-extensions](https://github.com/python/mypy_extensions) from 0.4.3 to 1.0.0. - [Release notes](https://github.com/python/mypy_extensions/releases) - [Commits](https://github.com/python/mypy_extensions/compare/0.4.3...1.0.0) --- updated-dependencies: - dependency-name: mypy-extensions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 60981ad92c..09f97847e1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -61,7 +61,7 @@ mccabe==0.6.1 # pylint mypy==0.991 ; implementation_name == "cpython" # via -r test-requirements.in -mypy-extensions==0.4.3 ; implementation_name == "cpython" +mypy-extensions==1.0.0 ; implementation_name == "cpython" # via # -r test-requirements.in # black From 7d9c83edeb7746d6522f89f8c1a02c0935bc15b8 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Wed, 8 Feb 2023 03:34:33 +0000 Subject: [PATCH 19/91] Run pip-compile in formatting check Additionally, commit autoformatter changes for Dependabot --- .github/workflows/ci.yml | 8 ++++++++ check.sh | 8 ++++++++ docs-requirements.txt | 6 ++++-- test-requirements.in | 1 + test-requirements.txt | 36 ++++++++++++++++++++++++++++++++---- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92bc20539d..047083876f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,6 +120,14 @@ jobs: CHECK_FORMATTING: '${{ matrix.check_formatting }}' # Should match 'name:' up above JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' + - name: Commit autoformatter changes + continue-on-error: true + if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git commit -am "Autoformatter changes" + git push macOS: name: 'macOS (${{ matrix.python }})' diff --git a/check.sh b/check.sh index 57f1e2db40..fbd440521c 100755 --- a/check.sh +++ b/check.sh @@ -28,6 +28,14 @@ mypy -m trio -m trio.testing --platform linux || EXIT_STATUS=$? mypy -m trio -m trio.testing --platform darwin || EXIT_STATUS=$? # tests FreeBSD too mypy -m trio -m trio.testing --platform win32 || EXIT_STATUS=$? +# Check pip compile is consistent +pip-compile test-requirements.in +pip-compile docs-requirements.in + +if git status --porcelain | grep -q "requirements.txt"; then + EXIT_STATUS=1 +fi + # Finally, leave a really clear warning of any issues and exit if [ $EXIT_STATUS -ne 0 ]; then cat < Date: Fri, 10 Feb 2023 14:34:19 +0000 Subject: [PATCH 20/91] Use the correct user for GitHub Actions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 047083876f..1584e356f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,8 +124,8 @@ jobs: continue-on-error: true if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' run: | - git config user.name github-actions - git config user.email github-actions@github.com + git config user.name 'github-actions[bot]' + git config user.email '41898282+github-actions[bot]@users.noreply.github.com' git commit -am "Autoformatter changes" git push From b1a8ef1dd37b16933ec829734d08e37ab7aef98d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 01:52:46 +0000 Subject: [PATCH 21/91] Bump sphinx-rtd-theme from 1.1.1 to 1.2.0 Bumps [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/readthedocs/sphinx_rtd_theme/releases) - [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst) - [Commits](https://github.com/readthedocs/sphinx_rtd_theme/compare/1.1.1...1.2.0) --- updated-dependencies: - dependency-name: sphinx-rtd-theme dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 537e0f908b..46c19380e3 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -68,7 +68,7 @@ sphinx==3.3.1 # -r docs-requirements.in # sphinx-rtd-theme # sphinxcontrib-trio -sphinx-rtd-theme==1.1.1 +sphinx-rtd-theme==1.2.0 # via -r docs-requirements.in sphinxcontrib-applehelp==1.0.4 # via sphinx @@ -76,6 +76,8 @@ sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==2.0.1 # via sphinx +sphinxcontrib-jquery==2.0.0 + # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-qthelp==1.0.3 @@ -84,8 +86,6 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in -tomli==2.0.1 - # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 From 104ed0beea71b3a689e7ad232dedf2abf2b89340 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 01:57:00 +0000 Subject: [PATCH 22/91] Fix autocommit step --- .github/workflows/ci.yml | 2 +- check.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1584e356f2..d9facabbe1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: git config user.name 'github-actions[bot]' git config user.email '41898282+github-actions[bot]@users.noreply.github.com' git commit -am "Autoformatter changes" - git push + git push origin "HEAD:${GITHUB_HEAD_REF}" macOS: name: 'macOS (${{ matrix.python }})' diff --git a/check.sh b/check.sh index fbd440521c..8416a9c5d1 100755 --- a/check.sh +++ b/check.sh @@ -33,6 +33,7 @@ pip-compile test-requirements.in pip-compile docs-requirements.in if git status --porcelain | grep -q "requirements.txt"; then + git status --porcelain EXIT_STATUS=1 fi From a211f635def378353b246d514d5d92c95c19a8cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 02:19:23 +0000 Subject: [PATCH 23/91] Bump black from 22.12.0 to 23.1.0 Bumps [black](https://github.com/psf/black) from 22.12.0 to 23.1.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/22.12.0...23.1.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index e6d832f9d0..1d45dd93ec 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,7 +17,7 @@ attrs==22.2.0 # pytest backcall==0.2.0 # via ipython -black==22.12.0 ; implementation_name == "cpython" +black==23.1.0 ; implementation_name == "cpython" # via -r test-requirements.in build==0.10.0 # via pip-tools @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -78,6 +74,7 @@ outcome==1.2.0 # via -r test-requirements.in packaging==23.0 # via + # black # build # pytest parso==0.8.3 @@ -124,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.8.1 @@ -145,10 +134,7 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From b196eb6e6c92fa7cffca14f607c552e5129b9da3 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 02:24:31 +0000 Subject: [PATCH 24/91] Try to fix committing one more time --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9facabbe1..3c5a8645c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} - name: Setup python uses: actions/setup-python@v2 if: "!endsWith(matrix.python, '-dev')" @@ -122,12 +124,12 @@ jobs: JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' - name: Commit autoformatter changes continue-on-error: true - if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' + if: failure() && matrix.check_formatting == '1' #&& github.actor == 'dependabot[bot]' run: | git config user.name 'github-actions[bot]' git config user.email '41898282+github-actions[bot]@users.noreply.github.com' git commit -am "Autoformatter changes" - git push origin "HEAD:${GITHUB_HEAD_REF}" + git push macOS: name: 'macOS (${{ matrix.python }})' From 93205f1957d35d8660907c3999192165f8340500 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 02:47:54 +0000 Subject: [PATCH 25/91] Autoformatter changes --- docs-requirements.txt | 2 ++ test-requirements.txt | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index 46c19380e3..ae4527f7c7 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -86,6 +86,8 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in +tomli==2.0.1 + # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 diff --git a/test-requirements.txt b/test-requirements.txt index 1d45dd93ec..8676cb210a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.8.1 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From bfe6e9b47cc19f392b508d4cdcc082dbb2c0ea64 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 02:50:10 +0000 Subject: [PATCH 26/91] Remove the testing configuration for autoformatting --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c5a8645c8..fcc10c8104 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' - name: Commit autoformatter changes continue-on-error: true - if: failure() && matrix.check_formatting == '1' #&& github.actor == 'dependabot[bot]' + if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' run: | git config user.name 'github-actions[bot]' git config user.email '41898282+github-actions[bot]@users.noreply.github.com' From 0381fef5a40d5206c018f9fd3f99e8770e798855 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 02:54:53 +0000 Subject: [PATCH 27/91] Make sure to actually commit black's changes --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcc10c8104..87c6fb93d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,7 @@ jobs: continue-on-error: true if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' run: | + black setup.py trio git config user.name 'github-actions[bot]' git config user.email '41898282+github-actions[bot]@users.noreply.github.com' git commit -am "Autoformatter changes" From 699efc898caeb87b208194b948b0380ae91d53d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:05:25 +0000 Subject: [PATCH 28/91] Bump pathspec from 0.10.3 to 0.11.0 Bumps [pathspec](https://github.com/cpburnz/python-pathspec) from 0.10.3 to 0.11.0. - [Release notes](https://github.com/cpburnz/python-pathspec/releases) - [Changelog](https://github.com/cpburnz/python-pathspec/blob/master/CHANGES.rst) - [Commits](https://github.com/cpburnz/python-pathspec/compare/v0.10.3...v0.11.0) --- updated-dependencies: - dependency-name: pathspec dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 8676cb210a..a65044dd89 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -83,7 +79,7 @@ packaging==23.0 # pytest parso==0.8.3 # via jedi -pathspec==0.10.3 +pathspec==0.11.0 # via black pexpect==4.8.0 # via ipython @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.8.1 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From b1fbbd3b870a4acbc8ea14bb76ac6a4a2920ed22 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 03:12:21 +0000 Subject: [PATCH 29/91] Give the committing job enough permissions --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87c6fb93d8..0b650fc520 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,12 @@ on: - "dependabot/**" pull_request: +# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions +permissions: + pull-requests: write + issues: write + repository-projects: write + jobs: Windows: name: 'Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }})' From 04b4b8818fdf305947f4bde6c0fed64430a13cad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:21:37 +0000 Subject: [PATCH 30/91] Bump traitlets from 5.8.1 to 5.9.0 Bumps [traitlets](https://github.com/ipython/traitlets) from 5.8.1 to 5.9.0. - [Release notes](https://github.com/ipython/traitlets/releases) - [Changelog](https://github.com/ipython/traitlets/blob/main/CHANGELOG.md) - [Commits](https://github.com/ipython/traitlets/compare/v5.8.1...v5.9.0) --- updated-dependencies: - dependency-name: traitlets dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index a65044dd89..2ea1640ff0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -123,7 +123,7 @@ sortedcontainers==2.4.0 # via -r test-requirements.in tomlkit==0.11.6 # via pylint -traitlets==5.8.1 +traitlets==5.9.0 # via # ipython # matplotlib-inline From 4ed59c327baa646662e1662295c8184e4a4c341a Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 03:33:09 +0000 Subject: [PATCH 31/91] GITHUB_TOKEN needs `contents` for `git push` --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b650fc520..55cd0bbf4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,12 +6,6 @@ on: - "dependabot/**" pull_request: -# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions -permissions: - pull-requests: write - issues: write - repository-projects: write - jobs: Windows: name: 'Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }})' @@ -77,6 +71,12 @@ jobs: name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' timeout-minutes: 10 runs-on: 'ubuntu-latest' + # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions + permissions: + pull-requests: write + issues: write + repository-projects: write + contents: write strategy: fail-fast: false matrix: From 4d02fa4028391b75d78483b3ba89ac0ff7736522 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:12:28 +0000 Subject: [PATCH 32/91] Bump astroid from 2.14.1 to 2.14.2 Bumps [astroid](https://github.com/PyCQA/astroid) from 2.14.1 to 2.14.2. - [Release notes](https://github.com/PyCQA/astroid/releases) - [Changelog](https://github.com/PyCQA/astroid/blob/main/ChangeLog) - [Commits](https://github.com/PyCQA/astroid/compare/v2.14.1...v2.14.2) --- updated-dependencies: - dependency-name: astroid dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 2ea1640ff0..c097fed8f9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,7 @@ # astor==0.8.1 # via -r test-requirements.in -astroid==2.14.1 +astroid==2.14.2 # via pylint async-generator==1.10 # via -r test-requirements.in From 1b4ed1c1b56287f2b6c03ba9841e996f5f46de3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:14:01 +0000 Subject: [PATCH 33/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ trio/_core/_instrumentation.py | 1 + trio/_core/_run.py | 1 + trio/_core/_traps.py | 2 ++ trio/_core/tests/test_guest_mode.py | 2 ++ trio/_socket.py | 1 + 6 files changed, 22 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index c097fed8f9..adab2e00bb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 diff --git a/trio/_core/_instrumentation.py b/trio/_core/_instrumentation.py index e14c1ef1e0..b133d47406 100644 --- a/trio/_core/_instrumentation.py +++ b/trio/_core/_instrumentation.py @@ -11,6 +11,7 @@ F = TypeVar("F", bound=Callable[..., Any]) + # Decorator to mark methods public. This does nothing by itself, but # trio/_tools/gen_exports.py looks for it. def _public(fn: F) -> F: diff --git a/trio/_core/_run.py b/trio/_core/_run.py index dc6ff21802..7811af172c 100644 --- a/trio/_core/_run.py +++ b/trio/_core/_run.py @@ -54,6 +54,7 @@ FnT = TypeVar("FnT", bound="Callable[..., Any]") + # Decorator to mark methods public. This does nothing by itself, but # trio/_tools/gen_exports.py looks for it. def _public(fn: FnT) -> FnT: diff --git a/trio/_core/_traps.py b/trio/_core/_traps.py index 39481c5903..aedf839a8d 100644 --- a/trio/_core/_traps.py +++ b/trio/_core/_traps.py @@ -10,6 +10,7 @@ from typing import Callable, NoReturn, Any + # Helper for the bottommost 'yield'. You can't use 'yield' inside an async # function, but you can inside a generator, and if you decorate your generator # with @types.coroutine, then it's even awaitable. However, it's still not a @@ -67,6 +68,7 @@ class WaitTaskRescheduled: RaiseCancelT = Callable[[], NoReturn] # TypeAlias + # Should always return the type a Task "expects", unless you willfully reschedule it # with a bad value. async def wait_task_rescheduled(abort_func: Callable[[RaiseCancelT], Abort]) -> Any: diff --git a/trio/_core/tests/test_guest_mode.py b/trio/_core/tests/test_guest_mode.py index a5d6d78e18..9fed232214 100644 --- a/trio/_core/tests/test_guest_mode.py +++ b/trio/_core/tests/test_guest_mode.py @@ -17,6 +17,7 @@ from .tutil import gc_collect_harder, buggy_pypy_asyncgens, restore_unraisablehook from ..._util import signal_raise + # The simplest possible "host" loop. # Nice features: # - we can run code "outside" of trio using the schedule function passed to @@ -227,6 +228,7 @@ async def sit_in_wait_all_tasks_blocked(watb_cscope): async def get_woken_by_host_deadline(watb_cscope): with trio.CancelScope() as cscope: print("scheduling stuff to happen") + # Altering the deadline from the host, to something in the # future, will cause the run loop to wake up, but then # discover that there is nothing to do and go back to sleep. diff --git a/trio/_socket.py b/trio/_socket.py index 8bfa6d265a..b12126f7e1 100644 --- a/trio/_socket.py +++ b/trio/_socket.py @@ -353,6 +353,7 @@ async def wrapper(self, *args, **kwargs): # addresses everywhere. Split out into a standalone function so it can be reused by # FakeNet. + # Take an address in Python's representation, and returns a new address in # the same representation, but with names resolved to numbers, # etc. From 1ae9e480bd38339fa588a964f6a20d9bc3b16a16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 11:03:30 +0000 Subject: [PATCH 34/91] Bump pylint from 2.16.1 to 2.16.2 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.16.1 to 2.16.2. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Commits](https://github.com/PyCQA/pylint/compare/v2.16.1...v2.16.2) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index adab2e00bb..14c1945362 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -109,7 +105,7 @@ pyflakes==2.4.0 # via flake8 pygments==2.14.0 # via ipython -pylint==2.16.1 +pylint==2.16.2 # via -r test-requirements.in pyopenssl==23.0.0 # via -r test-requirements.in @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 6d95ae98120a061750a80c3cda74d3d0dedc2c8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 11:05:18 +0000 Subject: [PATCH 35/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 14c1945362..307428a3a6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 64e9b2094f92f800dcc056d413d1f38684435387 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 11:08:26 +0000 Subject: [PATCH 36/91] Bump types-pyopenssl from 23.0.0.2 to 23.0.0.3 Bumps [types-pyopenssl](https://github.com/python/typeshed) from 23.0.0.2 to 23.0.0.3. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pyopenssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index adab2e00bb..e30981eb80 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -141,15 +129,12 @@ traitlets==5.9.0 # matplotlib-inline trustme==0.9.0 # via -r test-requirements.in -types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" +types-pyopenssl==23.0.0.3 ; implementation_name == "cpython" # via -r test-requirements.in typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From c9adb4960be822e3885629db3bf57a60c4f783fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 11:09:35 +0000 Subject: [PATCH 37/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index e30981eb80..7fdf78d3ef 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.3 ; implementation_name == "cpython" typing-extensions==4.4.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 6a49dce2acd50d3587db061adfa19e1d1f8387db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 12:46:40 +0000 Subject: [PATCH 38/91] Bump sphinx from 3.3.1 to 6.1.3 Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.3.1 to 6.1.3. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.3.1...v6.1.3) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- docs-requirements.in | 2 +- docs-requirements.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs-requirements.in b/docs-requirements.in index 7d6abc0033..fab339e1f9 100644 --- a/docs-requirements.in +++ b/docs-requirements.in @@ -1,6 +1,6 @@ # RTD is currently installing 1.5.3, which has a bug in :lineno-match: # sphinx-3.4 causes warnings about some trio._abc classes: GH#2338 -sphinx >= 1.7.0, < 3.4 +sphinx >= 1.7.0, < 6.2 # jinja2-3.1 causes importerror with sphinx<4.0 jinja2 < 3.1 sphinx_rtd_theme diff --git a/docs-requirements.txt b/docs-requirements.txt index ae4527f7c7..004b0f0fe0 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -24,7 +24,7 @@ click==8.1.3 # towncrier click-default-group==1.2.2 # via towncrier -docutils==0.17.1 +docutils==0.18.1 # via # sphinx # sphinx-rtd-theme @@ -63,7 +63,7 @@ snowballstemmer==2.2.0 # via sphinx sortedcontainers==2.4.0 # via -r docs-requirements.in -sphinx==3.3.1 +sphinx==6.1.3 # via # -r docs-requirements.in # sphinx-rtd-theme @@ -86,8 +86,6 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in -tomli==2.0.1 - # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 From 2b43f76367e8a8650bf3db20b3a556239894a83f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Feb 2023 12:47:51 +0000 Subject: [PATCH 39/91] Autoformatter changes --- docs-requirements.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index 004b0f0fe0..c83fa2b285 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -38,6 +38,8 @@ imagesize==1.4.1 # via sphinx immutables==0.19 # via -r docs-requirements.in +importlib-metadata==6.0.0 + # via sphinx incremental==22.10.0 # via towncrier jinja2==3.0.3 @@ -86,10 +88,14 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in +tomli==2.0.1 + # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 # via requests +zipp==3.13.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools From c6d2c071e1b1c37ba128927ffbcaa0644cbb0065 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:01:18 +0000 Subject: [PATCH 40/91] Bump typing-extensions from 4.4.0 to 4.5.0 Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](https://github.com/python/typing_extensions/compare/4.4.0...4.5.0) --- updated-dependencies: - dependency-name: typing-extensions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 307428a3a6..f2bca755f8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -143,13 +131,10 @@ trustme==0.9.0 # via -r test-requirements.in types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" # via -r test-requirements.in -typing-extensions==4.4.0 ; implementation_name == "cpython" +typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From d07a051a57dc334693c3e77a7cf29089dc6bee42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:02:56 +0000 Subject: [PATCH 41/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index f2bca755f8..9a2dd1651e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 17d76da1a9403647b5c7113b615eba4ee6f3f82f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:24:42 +0000 Subject: [PATCH 42/91] Bump mypy from 1.0.0 to 1.0.1 Bumps [mypy](https://github.com/python/mypy) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 5e6e39b6df..e4ec917b7b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -67,7 +63,7 @@ mccabe==0.6.1 # via # flake8 # pylint -mypy==1.0.0 ; implementation_name == "cpython" +mypy==1.0.1 ; implementation_name == "cpython" # via -r test-requirements.in mypy-extensions==1.0.0 ; implementation_name == "cpython" # via @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.3 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 5923c0774903f4777dc8cae119c724bbd6dc8653 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:27:20 +0000 Subject: [PATCH 43/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index e4ec917b7b..d6d2937bc8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.3 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 0ec92a50fbf8d2c838dd1e7e140a334c5b166b36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 11:00:30 +0000 Subject: [PATCH 44/91] Bump types-pyopenssl from 23.0.0.3 to 23.0.0.4 Bumps [types-pyopenssl](https://github.com/python/typeshed) from 23.0.0.3 to 23.0.0.4. - [Release notes](https://github.com/python/typeshed/releases) - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pyopenssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 5e6e39b6df..6c34093e8d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -141,15 +129,12 @@ traitlets==5.9.0 # matplotlib-inline trustme==0.9.0 # via -r test-requirements.in -types-pyopenssl==23.0.0.3 ; implementation_name == "cpython" +types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" # via -r test-requirements.in typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 28d080a012d94af8d94ea11c5c05bf56f1b36200 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 11:02:00 +0000 Subject: [PATCH 45/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 6c34093e8d..7082dc4212 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From de8ca19fa2849e07a709603bd90c0adb9b498c42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 10:22:59 +0000 Subject: [PATCH 46/91] Bump prompt-toolkit from 3.0.36 to 3.0.37 Bumps [prompt-toolkit](https://github.com/prompt-toolkit/python-prompt-toolkit) from 3.0.36 to 3.0.37. - [Release notes](https://github.com/prompt-toolkit/python-prompt-toolkit/releases) - [Changelog](https://github.com/prompt-toolkit/python-prompt-toolkit/blob/master/CHANGELOG) - [Commits](https://github.com/prompt-toolkit/python-prompt-toolkit/compare/3.0.36...3.0.37) --- updated-dependencies: - dependency-name: prompt-toolkit dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 7082dc4212..cd79a98cbc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -97,7 +93,7 @@ platformdirs==3.0.0 # pylint pluggy==1.0.0 # via pytest -prompt-toolkit==3.0.36 +prompt-toolkit==3.0.37 # via ipython ptyprocess==0.7.0 # via pexpect @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 14071f49895456085b54308640e59dd7bd27f101 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 10:24:39 +0000 Subject: [PATCH 47/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index cd79a98cbc..50026195e7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 3c048625f7dff7f9e97b97abcc83cc8a5bb6023a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:05:46 +0000 Subject: [PATCH 48/91] Bump wrapt from 1.14.1 to 1.15.0 Bumps [wrapt](https://github.com/GrahamDumpleton/wrapt) from 1.14.1 to 1.15.0. - [Release notes](https://github.com/GrahamDumpleton/wrapt/releases) - [Changelog](https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst) - [Commits](https://github.com/GrahamDumpleton/wrapt/compare/1.14.1...1.15.0) --- updated-dependencies: - dependency-name: wrapt dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 50026195e7..de2fcea2f8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,15 +134,12 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 # via pip-tools -wrapt==1.14.1 +wrapt==1.15.0 # via astroid # The following packages are considered to be unsafe in a requirements file: From 595362c04051795a48940996603ee5e2041790ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:07:34 +0000 Subject: [PATCH 49/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index de2fcea2f8..aa6ae164db 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 06372750829653c43796d61fabfa8439b6e51ba7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:06:17 +0000 Subject: [PATCH 50/91] Bump babel from 2.11.0 to 2.12.0 Bumps [babel](https://github.com/python-babel/babel) from 2.11.0 to 2.12.0. - [Release notes](https://github.com/python-babel/babel/releases) - [Changelog](https://github.com/python-babel/babel/blob/master/CHANGES.rst) - [Commits](https://github.com/python-babel/babel/compare/v2.11.0...v2.12.0) --- updated-dependencies: - dependency-name: babel dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs-requirements.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index ae4527f7c7..caf809993c 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -12,7 +12,7 @@ attrs==22.2.0 # via # -r docs-requirements.in # outcome -babel==2.11.0 +babel==2.12.0 # via sphinx certifi==2022.12.7 # via requests @@ -53,8 +53,6 @@ packaging==23.0 # via sphinx pygments==2.14.0 # via sphinx -pytz==2022.7.1 - # via babel requests==2.28.2 # via sphinx sniffio==1.3.0 @@ -86,8 +84,6 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in -tomli==2.0.1 - # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 From 9c6c2b07984ee530570a01b3710e729d3f5546b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:07:35 +0000 Subject: [PATCH 51/91] Autoformatter changes --- docs-requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index caf809993c..bfd8b8ed44 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -53,6 +53,8 @@ packaging==23.0 # via sphinx pygments==2.14.0 # via sphinx +pytz==2022.7.1 + # via babel requests==2.28.2 # via sphinx sniffio==1.3.0 @@ -84,6 +86,8 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in +tomli==2.0.1 + # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 From 8139a56c7cd6ed9d54f3b0e375ecef3a79595c48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:12:22 +0000 Subject: [PATCH 52/91] Bump prompt-toolkit from 3.0.37 to 3.0.38 Bumps [prompt-toolkit](https://github.com/prompt-toolkit/python-prompt-toolkit) from 3.0.37 to 3.0.38. - [Release notes](https://github.com/prompt-toolkit/python-prompt-toolkit/releases) - [Changelog](https://github.com/prompt-toolkit/python-prompt-toolkit/blob/master/CHANGELOG) - [Commits](https://github.com/prompt-toolkit/python-prompt-toolkit/compare/3.0.37...3.0.38) --- updated-dependencies: - dependency-name: prompt-toolkit dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index aa6ae164db..1901a0fe1e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -97,7 +93,7 @@ platformdirs==3.0.0 # pylint pluggy==1.0.0 # via pytest -prompt-toolkit==3.0.37 +prompt-toolkit==3.0.38 # via ipython ptyprocess==0.7.0 # via pexpect @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 36290994c4890d0f42f2c8352c3fc265b9bbcb64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:13:36 +0000 Subject: [PATCH 53/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 1901a0fe1e..741c68bc81 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 4eac9fc614b67ace845803649431144a9843c196 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:05:47 +0000 Subject: [PATCH 54/91] Bump babel from 2.12.0 to 2.12.1 Bumps [babel](https://github.com/python-babel/babel) from 2.12.0 to 2.12.1. - [Release notes](https://github.com/python-babel/babel/releases) - [Changelog](https://github.com/python-babel/babel/blob/master/CHANGES.rst) - [Commits](https://github.com/python-babel/babel/compare/v2.12.0...v2.12.1) --- updated-dependencies: - dependency-name: babel dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs-requirements.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index bfd8b8ed44..f42f64df55 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -12,7 +12,7 @@ attrs==22.2.0 # via # -r docs-requirements.in # outcome -babel==2.12.0 +babel==2.12.1 # via sphinx certifi==2022.12.7 # via requests @@ -53,8 +53,6 @@ packaging==23.0 # via sphinx pygments==2.14.0 # via sphinx -pytz==2022.7.1 - # via babel requests==2.28.2 # via sphinx sniffio==1.3.0 @@ -86,8 +84,6 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in -tomli==2.0.1 - # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 From 7071814bdbf990fadc7701dc33fca8a5b91d8651 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:07:16 +0000 Subject: [PATCH 55/91] Autoformatter changes --- docs-requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index f42f64df55..660a2d94b4 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -53,6 +53,8 @@ packaging==23.0 # via sphinx pygments==2.14.0 # via sphinx +pytz==2022.7.1 + # via babel requests==2.28.2 # via sphinx sniffio==1.3.0 @@ -84,6 +86,8 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sphinxcontrib-trio==1.1.2 # via -r docs-requirements.in +tomli==2.0.1 + # via towncrier towncrier==22.12.0 # via -r docs-requirements.in urllib3==1.26.14 From 428a257f9f84c0667fee4c8852dee0e56768e8f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 12:13:46 +0000 Subject: [PATCH 56/91] Bump pip-tools from 6.12.2 to 6.12.3 Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 6.12.2 to 6.12.3. - [Release notes](https://github.com/jazzband/pip-tools/releases) - [Changelog](https://github.com/jazzband/pip-tools/blob/main/CHANGELOG.md) - [Commits](https://github.com/jazzband/pip-tools/compare/6.12.2...6.12.3) --- updated-dependencies: - dependency-name: pip-tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 741c68bc81..667762f71a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -89,7 +85,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.12.2 +pip-tools==6.12.3 # via -r test-requirements.in platformdirs==3.0.0 # via @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 74061550b940e202a9c8ec554a2e5b99930fd3c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 12:18:24 +0000 Subject: [PATCH 57/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 667762f71a..d76447cb39 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From dac2f8cbdc2fef164438c0a1810fe47fab195e77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:21:19 +0000 Subject: [PATCH 58/91] Bump cryptography from 39.0.1 to 39.0.2 Bumps [cryptography](https://github.com/pyca/cryptography) from 39.0.1 to 39.0.2. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/39.0.1...39.0.2) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index d76447cb39..e9577238c2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -29,7 +29,7 @@ click==8.1.3 # pip-tools coverage[toml]==6.4.1 # via pytest-cov -cryptography==39.0.1 +cryptography==39.0.2 # via # -r test-requirements.in # pyopenssl @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From cb237764897c160e5b09f5bd07d7ccc4a3e4d19b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:22:43 +0000 Subject: [PATCH 59/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index e9577238c2..ce448d39a1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 1862393c1f75840c5e9376a7cbe4aa9642f4c4de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:10:53 +0000 Subject: [PATCH 60/91] Bump pylint from 2.16.2 to 2.16.3 Bumps [pylint](https://github.com/PyCQA/pylint) from 2.16.2 to 2.16.3. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Commits](https://github.com/PyCQA/pylint/compare/v2.16.2...v2.16.3) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index d76447cb39..71a92ebdac 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -109,7 +105,7 @@ pyflakes==2.4.0 # via flake8 pygments==2.14.0 # via ipython -pylint==2.16.2 +pylint==2.16.3 # via -r test-requirements.in pyopenssl==23.0.0 # via -r test-requirements.in @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From abb7c73ccd47a931dd0fd6b244d8bbf1c940d130 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 11:12:21 +0000 Subject: [PATCH 61/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 71a92ebdac..017f322ddf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 21f08cf0754207a133749acf768719c9b4288f3a Mon Sep 17 00:00:00 2001 From: richardsheridan Date: Sat, 4 Mar 2023 20:22:09 -0500 Subject: [PATCH 62/91] bump checkout version to revive CI --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55cd0bbf4a..8ad5c623c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup python uses: actions/setup-python@v2 with: @@ -106,7 +106,7 @@ jobs: }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.ref }} - name: Setup python @@ -153,7 +153,7 @@ jobs: extra_name: ', pypy 3.8 nightly' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup python uses: actions/setup-python@v2 with: From bf5f717b4722bbe8c25770dfff33994955cb55cc Mon Sep 17 00:00:00 2001 From: richardsheridan Date: Sat, 4 Mar 2023 20:22:59 -0500 Subject: [PATCH 63/91] remove pr head ref injection to revive CI --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ad5c623c7..eb28b14066 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,8 +107,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.ref }} - name: Setup python uses: actions/setup-python@v2 if: "!endsWith(matrix.python, '-dev')" From 8f90c60261526bc58cdd08a4fd1bd9484ad5fac4 Mon Sep 17 00:00:00 2001 From: richardsheridan Date: Sat, 4 Mar 2023 22:00:31 -0500 Subject: [PATCH 64/91] split highly permissioned dependabot autoformatter into separate job --- .github/workflows/ci.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb28b14066..d875aadf35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,12 +71,6 @@ jobs: name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' timeout-minutes: 10 runs-on: 'ubuntu-latest' - # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions - permissions: - pull-requests: write - issues: write - repository-projects: write - contents: write strategy: fail-fast: false matrix: @@ -126,9 +120,33 @@ jobs: CHECK_FORMATTING: '${{ matrix.check_formatting }}' # Should match 'name:' up above JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})' + + autofmt: + name: Autoformat dependabot PR + timeout-minutes: 10 + if: github.actor == 'dependabot[bot]' + runs-on: 'ubuntu-latest' + # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions + permissions: + pull-requests: write + issues: write + repository-projects: write + contents: write + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.ref }} + - name: Setup python + uses: actions/setup-python@v2 + with: + python-version: "3.8" + - name: Check formatting + run: | + python -m pip install -r test-requirements.txt + source check.sh - name: Commit autoformatter changes - continue-on-error: true - if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' + if: failure() run: | black setup.py trio git config user.name 'github-actions[bot]' From 06db0cb92490efb82046b03118db5e65a82c2c15 Mon Sep 17 00:00:00 2001 From: richardsheridan Date: Sat, 4 Mar 2023 22:16:13 -0500 Subject: [PATCH 65/91] run instead of source Co-authored-by: EXPLOSION --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d875aadf35..145ee55b11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,7 +144,7 @@ jobs: - name: Check formatting run: | python -m pip install -r test-requirements.txt - source check.sh + ./check.sh - name: Commit autoformatter changes if: failure() run: | From b65b44ccc7318a898eb22853f982b40bd66c3e44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 03:27:56 +0000 Subject: [PATCH 66/91] Bump platformdirs from 3.0.0 to 3.1.0 Bumps [platformdirs](https://github.com/platformdirs/platformdirs) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/platformdirs/platformdirs/releases) - [Changelog](https://github.com/platformdirs/platformdirs/blob/main/CHANGES.rst) - [Commits](https://github.com/platformdirs/platformdirs/compare/3.0.0...3.1.0) --- updated-dependencies: - dependency-name: platformdirs dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index f49e777148..88d0b490ff 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -91,7 +87,7 @@ pickleshare==0.7.5 # via ipython pip-tools==6.12.3 # via -r test-requirements.in -platformdirs==3.0.0 +platformdirs==3.1.0 # via # black # pylint @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From f0f72adef12232a5b866bc54c7c86c169c5fa44e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 03:28:56 +0000 Subject: [PATCH 67/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 88d0b490ff..f2f7e37778 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 9eae00d1f0b16244ea10f052f2361a61b76e331b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 03:44:13 +0000 Subject: [PATCH 68/91] Bump pytest from 7.2.1 to 7.2.2 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.1 to 7.2.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.2.1...7.2.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index f2f7e37778..1f14f8bc35 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,10 +39,6 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint -exceptiongroup==1.1.0 ; python_version < "3.11" - # via - # -r test-requirements.in - # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -115,7 +111,7 @@ pyopenssl==23.0.0 # via -r test-requirements.in pyproject-hooks==1.0.0 # via build -pytest==7.2.1 +pytest==7.2.2 # via # -r test-requirements.in # pytest-cov @@ -125,14 +121,6 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in -tomli==2.0.1 - # via - # black - # build - # coverage - # mypy - # pylint - # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -146,10 +134,7 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in - # astroid - # black # mypy - # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From 5ad1b8bf61f60eafac93422574f0fa5d471cc7d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 03:48:05 +0000 Subject: [PATCH 69/91] Autoformatter changes --- test-requirements.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index 1f14f8bc35..b19d24334d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,6 +39,10 @@ decorator==5.1.1 # via ipython dill==0.3.6 # via pylint +exceptiongroup==1.1.0 ; python_version < "3.11" + # via + # -r test-requirements.in + # pytest flake8==4.0.1 # via -r test-requirements.in idna==3.4 @@ -121,6 +125,14 @@ sniffio==1.3.0 # via -r test-requirements.in sortedcontainers==2.4.0 # via -r test-requirements.in +tomli==2.0.1 + # via + # black + # build + # coverage + # mypy + # pylint + # pytest tomlkit==0.11.6 # via pylint traitlets==5.9.0 @@ -134,7 +146,10 @@ types-pyopenssl==23.0.0.4 ; implementation_name == "cpython" typing-extensions==4.5.0 ; implementation_name == "cpython" # via # -r test-requirements.in + # astroid + # black # mypy + # pylint wcwidth==0.2.6 # via prompt-toolkit wheel==0.38.4 From f860ff77596fe5633196c7f238d51a6518182ec5 Mon Sep 17 00:00:00 2001 From: richardsheridan Date: Sun, 5 Mar 2023 00:02:05 -0500 Subject: [PATCH 70/91] enable sphinx 6 --- docs/source/_templates/layout.html | 9 +++++++-- docs/source/conf.py | 5 +++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html index d3b0ca89fd..dbebf5c2ae 100644 --- a/docs/source/_templates/layout.html +++ b/docs/source/_templates/layout.html @@ -4,8 +4,13 @@ {% extends "!layout.html" %} {% block sidebartitle %} -