From 0307a94f06254f34669d9704e8bc22d97b4f9690 Mon Sep 17 00:00:00 2001 From: Bruce Merry Date: Fri, 1 Sep 2023 16:45:26 +0200 Subject: [PATCH] Remove .pyi file entries for removed functionality This was missed in #247. --- doc/changelog.rst | 1 + src/spead2/recv/__init__.pyi | 25 ------------ src/spead2/send/__init__.pyi | 76 ------------------------------------ src/spead2/send/asyncio.pyi | 13 ------ 4 files changed, 1 insertion(+), 114 deletions(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index 26c2a3f45..6dd64e012 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -23,6 +23,7 @@ changes have been made: - Document that Meson must be at least 1.2. - Make source paths in :file:`.debug` files more usable (relative to 4.0.0b1). +- Remove :file:`.pyi` file entries for the functionality removed in 4.0. .. rubric:: 4.0.0b1 diff --git a/src/spead2/recv/__init__.pyi b/src/spead2/recv/__init__.pyi index a2e1d5d4b..02ca0a827 100644 --- a/src/spead2/recv/__init__.pyi +++ b/src/spead2/recv/__init__.pyi @@ -164,9 +164,6 @@ class Ringbuffer: def capacity(self) -> int: ... class _Stream: - DEFAULT_UDP_IBV_MAX_SIZE: ClassVar[int] - DEFAULT_UDP_IBV_BUFFER_SIZE: ClassVar[int] - DEFAULT_UDP_IBV_MAX_POLL: ClassVar[int] DEFAULT_UDP_MAX_SIZE: ClassVar[int] DEFAULT_UDP_BUFFER_SIZE: ClassVar[int] DEFAULT_TCP_MAX_SIZE: ClassVar[int] @@ -203,28 +200,6 @@ class _Stream: ) -> None: ... @overload def add_tcp_reader(self, acceptor: socket.socket, max_size: int = ...) -> None: ... - @overload - def add_udp_ibv_reader( - self, - multicast_group: str, - port: int, - interface_address: str, - max_size: int = ..., - buffer_size: int = ..., - comp_vector: int = ..., - max_poll: int = ..., - ) -> None: ... - @overload - def add_udp_ibv_reader( - self, - endpoints: Sequence[tuple[str, int]], - interface_address: str, - max_size: int = ..., - buffer_size: int = ..., - comp_vector: int = ..., - max_poll: int = ..., - ) -> None: ... - @overload def add_udp_ibv_reader(self, config: UdpIbvConfig) -> None: ... def add_udp_pcap_file_reader(self, filename: str, filter: str = ...) -> None: ... def add_inproc_reader(self, queue: spead2.InprocQueue) -> None: ... diff --git a/src/spead2/send/__init__.pyi b/src/spead2/send/__init__.pyi index eef30f38e..7abd08324 100644 --- a/src/spead2/send/__init__.pyi +++ b/src/spead2/send/__init__.pyi @@ -98,46 +98,6 @@ class SyncStream(Stream): class _UdpStream: DEFAULT_BUFFER_SIZE: ClassVar[int] - @overload - def __init__( - self, - thread_pool: spead2.ThreadPool, - hostname: str, - port: int, - config: StreamConfig = ..., - buffer_size: int = ..., - interface_address: str = ..., - ) -> None: ... - @overload - def __init__( - self, - thread_pool: spead2.ThreadPool, - hostname: str, - port: int, - config: StreamConfig, - buffer_size: int, - ttl: int, - ) -> None: ... - @overload - def __init__( - self, - thread_pool: spead2.ThreadPool, - multicast_group: str, - port: int, - config: StreamConfig, - ttl: int, - interface_address: str, - ) -> None: ... - @overload - def __init__( - self, - thread_pool: spead2.ThreadPool, - multicast_group: str, - port: int, - config: StreamConfig, - ttl: int, - interface_index: int, - ) -> None: ... @overload def __init__( self, @@ -147,8 +107,6 @@ class _UdpStream: port: int, config: StreamConfig = ..., ) -> None: ... - - # Endpoint list variants @overload def __init__( self, @@ -221,23 +179,6 @@ class UdpIbvConfig: ) -> None: ... class _UdpIbvStream: - DEFAULT_BUFFER_SIZE: ClassVar[int] - DEFAULT_MAX_POLL: ClassVar[int] - - @overload - def __init__( - self, - thread_pool: spead2.ThreadPool, - multicast_group: str, - port: int, - config: StreamConfig, - interface_address: str, - buffer_size: int = ..., - ttl: int = ..., - comp_vector: int = ..., - max_pool: int = ..., - ) -> None: ... - @overload def __init__( self, thread_pool: spead2.ThreadPool, config: StreamConfig, udp_ibv_config: UdpIbvConfig ) -> None: ... @@ -253,16 +194,6 @@ class TcpStream(_TcpStream, SyncStream): self, thread_pool: spead2.ThreadPool, socket: socket.socket, config: StreamConfig = ... ) -> None: ... @overload - def __init__( - self, - thread_pool: spead2.ThreadPool, - hostname: str, - port: int, - config: StreamConfig = ..., - buffer_size: int = ..., - interface_address: str = ..., - ) -> None: ... - @overload def __init__( self, thread_pool: spead2.ThreadPool, @@ -277,15 +208,8 @@ class BytesStream(SyncStream): def __init__(self, thread_pool: spead2.ThreadPool, config: StreamConfig = ...) -> None: ... class _InprocStream: - @property - def queue(self) -> spead2.InprocQueue: ... @property def queues(self) -> Sequence[spead2.InprocQueue]: ... - @overload - def __init__( - self, thread_pool: spead2.ThreadPool, queue: spead2.InprocQueue, config: StreamConfig = ... - ) -> None: ... - @overload def __init__( self, thread_pool: spead2.ThreadPool, diff --git a/src/spead2/send/asyncio.pyi b/src/spead2/send/asyncio.pyi index 341331f9d..b0d8e00ee 100644 --- a/src/spead2/send/asyncio.pyi +++ b/src/spead2/send/asyncio.pyi @@ -15,7 +15,6 @@ import asyncio import socket -from typing import overload import spead2 import spead2.send @@ -45,18 +44,6 @@ class TcpStream(spead2.send._TcpStream, AsyncStream): socket: socket.socket, config: spead2.send.StreamConfig = ..., ) -> None: ... - @overload - @classmethod - async def connect( - self, - thread_pool: spead2.ThreadPool, - hostname: str, - port: int, - config: spead2.send.StreamConfig = ..., - buffer_size: int = ..., - interface_address: str = ..., - ) -> None: ... - @overload @classmethod async def connect( self,