From a002c84c2236e7a5995819e70fdc84dbae0c77e5 Mon Sep 17 00:00:00 2001 From: Moritz Marseu Date: Mon, 5 Aug 2024 16:03:19 +0200 Subject: [PATCH 1/7] Update jsonschema.protocols --- stubs/jsonschema/jsonschema/protocols.pyi | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index 1bde7a46cff9..44796fa266c2 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -1,29 +1,34 @@ from _typeshed import Incomplete from collections.abc import Iterator, Mapping, Sequence from typing import ClassVar, Protocol -from typing_extensions import TypeAlias +from typing_extensions import TypeAlias, deprecated +from jsonschema import _typing from jsonschema._format import FormatChecker from jsonschema._types import TypeChecker from jsonschema.exceptions import ValidationError from jsonschema.validators import RefResolver +import referencing _JsonParameter: TypeAlias = str | int | float | bool | None | Mapping[str, _JsonParameter] | Sequence[_JsonParameter] class Validator(Protocol): - META_SCHEMA: ClassVar[dict[Incomplete, Incomplete]] - VALIDATORS: ClassVar[dict[Incomplete, Incomplete]] + META_SCHEMA: ClassVar[Mapping[Incomplete, Incomplete]] + VALIDATORS: ClassVar[Mapping[Incomplete, Incomplete]g] TYPE_CHECKER: ClassVar[TypeChecker] FORMAT_CHECKER: ClassVar[FormatChecker] - schema: dict[Incomplete, Incomplete] | bool + ID_OF: _typing.id_of + schema: Mapping[Incomplete, Incomplete] | bool def __init__( self, - schema: dict[Incomplete, Incomplete] | bool, + schema: Mapping[Incomplete, Incomplete] | bool, + registry: referencing.jsonschema.SchemaRegistry, + @deprecated("'RefResolver' has been deprecated in favor of 'referencing'") resolver: RefResolver | None = None, format_checker: FormatChecker | None = None, ) -> None: ... @classmethod - def check_schema(cls, schema: dict[Incomplete, Incomplete]) -> None: ... + def check_schema(cls, schema: Mapping[Incomplete, Incomplete]) -> None: ... def is_type(self, instance: _JsonParameter, type: str) -> bool: ... def is_valid(self, instance: _JsonParameter) -> bool: ... def iter_errors(self, instance: _JsonParameter) -> Iterator[ValidationError]: ... From 2bc7e7a50572853e883bd83498b05dba8abe540e Mon Sep 17 00:00:00 2001 From: Moritz Marseu Date: Tue, 6 Aug 2024 08:34:24 +0200 Subject: [PATCH 2/7] Fix typo --- stubs/jsonschema/jsonschema/protocols.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index 44796fa266c2..065d3297c60e 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -14,7 +14,7 @@ _JsonParameter: TypeAlias = str | int | float | bool | None | Mapping[str, _Json class Validator(Protocol): META_SCHEMA: ClassVar[Mapping[Incomplete, Incomplete]] - VALIDATORS: ClassVar[Mapping[Incomplete, Incomplete]g] + VALIDATORS: ClassVar[Mapping[Incomplete, Incomplete]] TYPE_CHECKER: ClassVar[TypeChecker] FORMAT_CHECKER: ClassVar[FormatChecker] ID_OF: _typing.id_of From 432f85dd8c186093ecdd9fb299fd2444248d6ee9 Mon Sep 17 00:00:00 2001 From: Moritz Marseu Date: Tue, 6 Aug 2024 08:42:54 +0200 Subject: [PATCH 3/7] Remove invalid deprecation notice --- stubs/jsonschema/jsonschema/protocols.pyi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index 065d3297c60e..0802972b1ed0 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Iterator, Mapping, Sequence from typing import ClassVar, Protocol -from typing_extensions import TypeAlias, deprecated +from typing_extensions import TypeAlias from jsonschema import _typing from jsonschema._format import FormatChecker @@ -23,7 +23,6 @@ class Validator(Protocol): self, schema: Mapping[Incomplete, Incomplete] | bool, registry: referencing.jsonschema.SchemaRegistry, - @deprecated("'RefResolver' has been deprecated in favor of 'referencing'") resolver: RefResolver | None = None, format_checker: FormatChecker | None = None, ) -> None: ... From f7f3f72a0942a036c2711d81a4edacedb89a2d8b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 06:44:44 +0000 Subject: [PATCH 4/7] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/jsonschema/jsonschema/protocols.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index 0802972b1ed0..ebfb61b4c0bd 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -3,12 +3,12 @@ from collections.abc import Iterator, Mapping, Sequence from typing import ClassVar, Protocol from typing_extensions import TypeAlias +import referencing from jsonschema import _typing from jsonschema._format import FormatChecker from jsonschema._types import TypeChecker from jsonschema.exceptions import ValidationError from jsonschema.validators import RefResolver -import referencing _JsonParameter: TypeAlias = str | int | float | bool | None | Mapping[str, _JsonParameter] | Sequence[_JsonParameter] From 5dae1edf7b4b4d911fe3e7f32a4ca96d68e145a4 Mon Sep 17 00:00:00 2001 From: Moritz Marseu Date: Tue, 6 Aug 2024 09:33:38 +0200 Subject: [PATCH 5/7] Hopefully fix import error --- stubs/jsonschema/jsonschema/protocols.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index ebfb61b4c0bd..b96d7a88ac0e 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -3,12 +3,12 @@ from collections.abc import Iterator, Mapping, Sequence from typing import ClassVar, Protocol from typing_extensions import TypeAlias -import referencing from jsonschema import _typing from jsonschema._format import FormatChecker from jsonschema._types import TypeChecker from jsonschema.exceptions import ValidationError from jsonschema.validators import RefResolver +from referencing.jsonschema import SchemaRegistry _JsonParameter: TypeAlias = str | int | float | bool | None | Mapping[str, _JsonParameter] | Sequence[_JsonParameter] @@ -22,7 +22,7 @@ class Validator(Protocol): def __init__( self, schema: Mapping[Incomplete, Incomplete] | bool, - registry: referencing.jsonschema.SchemaRegistry, + registry: SchemaRegistry, resolver: RefResolver | None = None, format_checker: FormatChecker | None = None, ) -> None: ... From ab23d9c8b4b755ddebdf5258e919adb637ab0b92 Mon Sep 17 00:00:00 2001 From: Moritz Marseu Date: Mon, 14 Oct 2024 08:28:03 +0200 Subject: [PATCH 6/7] Update protocols.pyi Remove `resolver` param from __init__() --- stubs/jsonschema/jsonschema/protocols.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index b96d7a88ac0e..16589744773d 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -23,7 +23,6 @@ class Validator(Protocol): self, schema: Mapping[Incomplete, Incomplete] | bool, registry: SchemaRegistry, - resolver: RefResolver | None = None, format_checker: FormatChecker | None = None, ) -> None: ... @classmethod From 7b6204219f0d7b1a025ade09f1b12ead41333bc0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 06:29:33 +0000 Subject: [PATCH 7/7] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/jsonschema/jsonschema/protocols.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index 16589744773d..f51c45cb83c3 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -7,7 +7,6 @@ from jsonschema import _typing from jsonschema._format import FormatChecker from jsonschema._types import TypeChecker from jsonschema.exceptions import ValidationError -from jsonschema.validators import RefResolver from referencing.jsonschema import SchemaRegistry _JsonParameter: TypeAlias = str | int | float | bool | None | Mapping[str, _JsonParameter] | Sequence[_JsonParameter]