From 5bf672ce4242738d57f4060d1a90f9370759a399 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Wed, 19 Jan 2022 16:05:15 +0100 Subject: [PATCH] Update redis stubs to 4.1.1 (#6960) Closes: #6951 --- stubs/redis/@tests/stubtest_allowlist.txt | 1 - stubs/redis/redis/client.pyi | 13 +++++++++++++ stubs/redis/redis/cluster.pyi | 10 +--------- stubs/redis/redis/commands/search/commands.pyi | 5 +++++ stubs/redis/redis/connection.pyi | 6 ++++++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/stubs/redis/@tests/stubtest_allowlist.txt b/stubs/redis/@tests/stubtest_allowlist.txt index 5ffebc2bb..380970ad8 100644 --- a/stubs/redis/@tests/stubtest_allowlist.txt +++ b/stubs/redis/@tests/stubtest_allowlist.txt @@ -1,3 +1,2 @@ redis.client.Pipeline.transaction # instance attribute has same name as superclass method redis.ocsp # requires cryptography to be installed -redis.* # temporary, see #6951 diff --git a/stubs/redis/redis/client.pyi b/stubs/redis/redis/client.pyi index 77291e7f8..554cb1abc 100644 --- a/stubs/redis/redis/client.pyi +++ b/stubs/redis/redis/client.pyi @@ -168,6 +168,9 @@ class Redis(RedisModuleCommands, CoreCommands[_StrType], SentinelCommands, Gener ssl_check_hostname: bool = ..., ssl_password: Any | None = ..., ssl_validate_ocsp: bool = ..., + ssl_validate_ocsp_stapled: bool = ..., # added in 4.1.1 + ssl_ocsp_context: Any | None = ..., # added in 4.1.1 + ssl_ocsp_expected_cert: Any | None = ..., # added in 4.1.1 max_connections: int | None = ..., single_connection_client: bool = ..., health_check_interval: float = ..., @@ -202,6 +205,11 @@ class Redis(RedisModuleCommands, CoreCommands[_StrType], SentinelCommands, Gener ssl_cert_reqs: str | int | None = ..., ssl_ca_certs: str | None = ..., ssl_check_hostname: bool = ..., + ssl_password: Any | None = ..., + ssl_validate_ocsp: bool = ..., + ssl_validate_ocsp_stapled: bool = ..., # added in 4.1.1 + ssl_ocsp_context: Any | None = ..., # added in 4.1.1 + ssl_ocsp_expected_cert: Any | None = ..., # added in 4.1.1 max_connections: int | None = ..., single_connection_client: bool = ..., health_check_interval: float = ..., @@ -235,6 +243,11 @@ class Redis(RedisModuleCommands, CoreCommands[_StrType], SentinelCommands, Gener ssl_cert_reqs: str | int | None = ..., ssl_ca_certs: str | None = ..., ssl_check_hostname: bool = ..., + ssl_password: Any | None = ..., + ssl_validate_ocsp: bool = ..., + ssl_validate_ocsp_stapled: bool = ..., # added in 4.1.1 + ssl_ocsp_context: Any | None = ..., # added in 4.1.1 + ssl_ocsp_expected_cert: Any | None = ..., # added in 4.1.1 max_connections: int | None = ..., single_connection_client: bool = ..., health_check_interval: float = ..., diff --git a/stubs/redis/redis/cluster.pyi b/stubs/redis/redis/cluster.pyi index 74241e7a0..fe6b8c45a 100644 --- a/stubs/redis/redis/cluster.pyi +++ b/stubs/redis/redis/cluster.pyi @@ -55,7 +55,6 @@ class RedisCluster(RedisClusterCommands[_StrType], Generic[_StrType]): startup_nodes: Any | None = ..., cluster_error_retry_attempts: int = ..., require_full_coverage: bool = ..., - skip_full_coverage_check: bool = ..., reinitialize_steps: int = ..., read_from_replicas: bool = ..., url: Any | None = ..., @@ -114,20 +113,13 @@ class NodesManager: connection_kwargs: Any read_load_balancer: Any def __init__( - self, - startup_nodes, - from_url: bool = ..., - require_full_coverage: bool = ..., - skip_full_coverage_check: bool = ..., - lock: Any | None = ..., - **kwargs, + self, startup_nodes, from_url: bool = ..., require_full_coverage: bool = ..., lock: Any | None = ..., **kwargs ) -> None: ... def get_node(self, host: Any | None = ..., port: Any | None = ..., node_name: Any | None = ...): ... def update_moved_exception(self, exception) -> None: ... def get_node_from_slot(self, slot, read_from_replicas: bool = ..., server_type: Any | None = ...): ... def get_nodes_by_server_type(self, server_type): ... def populate_startup_nodes(self, nodes) -> None: ... - def cluster_require_full_coverage(self, cluster_nodes): ... def check_slots_coverage(self, slots_cache): ... def create_redis_connections(self, nodes) -> None: ... def create_redis_node(self, host, port, **kwargs): ... diff --git a/stubs/redis/redis/commands/search/commands.pyi b/stubs/redis/redis/commands/search/commands.pyi index 05c9a0a95..9765b2f5b 100644 --- a/stubs/redis/redis/commands/search/commands.pyi +++ b/stubs/redis/redis/commands/search/commands.pyi @@ -50,6 +50,11 @@ class SearchCommands: no_field_flags: bool = ..., stopwords: Any | None = ..., definition: Any | None = ..., + max_text_fields: bool = ..., # added in 4.1.1 + temporary: Any | None = ..., # added in 4.1.1 + no_highlight: bool = ..., # added in 4.1.1 + no_term_frequencies: bool = ..., # added in 4.1.1 + skip_initial_scan: bool = ..., # added in 4.1.1 ): ... def alter_schema_add(self, fields): ... def dropindex(self, delete_documents: bool = ...): ... diff --git a/stubs/redis/redis/connection.pyi b/stubs/redis/redis/connection.pyi index 7a4f79a08..241b501db 100644 --- a/stubs/redis/redis/connection.pyi +++ b/stubs/redis/redis/connection.pyi @@ -124,6 +124,9 @@ class SSLConnection(Connection): check_hostname: bool certificate_password: Any | None ssl_validate_ocsp: bool + ssl_validate_ocsp_stapled: bool # added in 4.1.1 + ssl_ocsp_context: Any | None # added in 4.1.1 + ssl_ocsp_expected_cert: Any | None # added in 4.1.1 def __init__( self, ssl_keyfile=..., @@ -134,6 +137,9 @@ class SSLConnection(Connection): ssl_ca_path: Any | None = ..., ssl_password: Any | None = ..., ssl_validate_ocsp: bool = ..., + ssl_validate_ocsp_stapled: bool = ..., # added in 4.1.1 + ssl_ocsp_context: Any | None = ..., # added in 4.1.1 + ssl_ocsp_expected_cert: Any | None = ..., # added in 4.1.1 **kwargs, ) -> None: ...