From 488d17b65c6bff5aa80abc125ba05dbdcb7443d1 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Wed, 14 Apr 2021 12:59:57 +0300 Subject: [PATCH] django-stubs-ext@0.2.0 --- django-stubs/db/models/fields/json.pyi | 5 +---- django-stubs/db/models/indexes.pyi | 1 - django-stubs/http/response.pyi | 2 +- django-stubs/template/library.pyi | 4 +--- django-stubs/urls/conf.pyi | 4 +++- django-stubs/views/static.pyi | 4 +++- django_stubs_ext/setup.py | 5 ++++- django_stubs_ext/tests/test_monkeypatching.py | 7 ++++--- setup.py | 1 + 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/django-stubs/db/models/fields/json.pyi b/django-stubs/db/models/fields/json.pyi index 20cc279..dc4484c 100644 --- a/django-stubs/db/models/fields/json.pyi +++ b/django-stubs/db/models/fields/json.pyi @@ -4,7 +4,6 @@ from django.db.models import lookups from django.db.models.lookups import PostgresOperatorLookup, Transform from typing import Any, Optional, Callable - class JSONField(CheckFieldDefaultMixin, Field): def __init__( self, @@ -17,7 +16,6 @@ class JSONField(CheckFieldDefaultMixin, Field): class DataContains(PostgresOperatorLookup): ... class ContainedBy(PostgresOperatorLookup): ... - class HasKeyLookup(PostgresOperatorLookup): ... class HasKey(HasKeyLookup): ... class HasKeys(HasKeyLookup): ... @@ -30,13 +28,13 @@ class KeyTransform(Transform): def preprocess_lhs(self, compiler: Any, connection: Any, lhs_only: bool = ...): ... class KeyTextTransform(KeyTransform): ... + class KeyTransformTextLookupMixin: def __init__(self, key_transform: Any, *args: Any, **kwargs: Any) -> None: ... class CaseInsensitiveMixin: ... class KeyTransformIsNull(lookups.IsNull): ... class KeyTransformIn(lookups.In): ... - class KeyTransformExact(JSONExact): ... class KeyTransformIExact(CaseInsensitiveMixin, KeyTransformTextLookupMixin, lookups.IExact): ... class KeyTransformIContains(CaseInsensitiveMixin, KeyTransformTextLookupMixin, lookups.IContains): ... @@ -46,7 +44,6 @@ class KeyTransformEndsWith(KeyTransformTextLookupMixin, lookups.EndsWith): ... class KeyTransformIEndsWith(CaseInsensitiveMixin, KeyTransformTextLookupMixin, lookups.IEndsWith): ... class KeyTransformRegex(KeyTransformTextLookupMixin, lookups.Regex): ... class KeyTransformIRegex(CaseInsensitiveMixin, KeyTransformTextLookupMixin, lookups.IRegex): ... - class KeyTransformNumericLookupMixin: ... class KeyTransformLt(KeyTransformNumericLookupMixin, lookups.LessThan): ... class KeyTransformLte(KeyTransformNumericLookupMixin, lookups.LessThanOrEqual): ... diff --git a/django-stubs/db/models/indexes.pyi b/django-stubs/db/models/indexes.pyi index 183f5b5..9a4f5e8 100644 --- a/django-stubs/db/models/indexes.pyi +++ b/django-stubs/db/models/indexes.pyi @@ -6,7 +6,6 @@ from django.db.models.base import Model from django.db.models.expressions import BaseExpression, Combinable from django.db.models.query_utils import Q - class Index: model: Type[Model] suffix: str = ... diff --git a/django-stubs/http/response.pyi b/django-stubs/http/response.pyi index f1581dd..67ca939 100644 --- a/django-stubs/http/response.pyi +++ b/django-stubs/http/response.pyi @@ -15,7 +15,7 @@ class BadHeaderError(ValueError): ... class ResponseHeaders(CaseInsensitiveMapping): store: Dict[str, str] = ... def __init__(self, data: Dict[str, str]) -> None: ... - def _convert_to_charset(self, value: Union[bytes, str], charset: str, mime_encode: str=...) -> str: ... + def _convert_to_charset(self, value: Union[bytes, str], charset: str, mime_encode: str = ...) -> str: ... def __delitem__(self, key: str) -> None: ... def __setitem__(self, key: str, value: str) -> None: ... def pop(self, key: str, default: Optional[str] = ...) -> str: ... diff --git a/django-stubs/template/library.pyi b/django-stubs/template/library.pyi index 25fc7e6..04e43a2 100644 --- a/django-stubs/template/library.pyi +++ b/django-stubs/template/library.pyi @@ -30,9 +30,7 @@ class Library: @overload def simple_tag(self, func: _C) -> _C: ... @overload - def simple_tag( - self, takes_context: Optional[bool] = ..., name: Optional[str] = ... - ) -> Callable[[_C], _C]: ... + def simple_tag(self, takes_context: Optional[bool] = ..., name: Optional[str] = ...) -> Callable[[_C], _C]: ... def inclusion_tag( self, filename: Union[Template, str], diff --git a/django-stubs/urls/conf.pyi b/django-stubs/urls/conf.pyi index b09f469..638447f 100644 --- a/django-stubs/urls/conf.pyi +++ b/django-stubs/urls/conf.pyi @@ -4,7 +4,9 @@ from .resolvers import URLResolver, URLPattern from ..conf.urls import IncludedURLConf from ..http.response import HttpResponseBase -def include(arg: Any, namespace: Optional[str] = ...) -> Tuple[List[Union[URLResolver, URLPattern]], Optional[str], Optional[str]]: ... +def include( + arg: Any, namespace: Optional[str] = ... +) -> Tuple[List[Union[URLResolver, URLPattern]], Optional[str], Optional[str]]: ... # path() @overload diff --git a/django-stubs/views/static.pyi b/django-stubs/views/static.pyi index 5839f66..f0d6266 100644 --- a/django-stubs/views/static.pyi +++ b/django-stubs/views/static.pyi @@ -3,7 +3,9 @@ from typing import Any, Optional from django.http.request import HttpRequest from django.http.response import FileResponse -def serve(request: HttpRequest, path: str, document_root: Optional[str] = ..., show_indexes: bool = ...) -> FileResponse: ... +def serve( + request: HttpRequest, path: str, document_root: Optional[str] = ..., show_indexes: bool = ... +) -> FileResponse: ... DEFAULT_DIRECTORY_INDEX_TEMPLATE: str template_translatable: Any diff --git a/django_stubs_ext/setup.py b/django_stubs_ext/setup.py index 91212cb..ae3d9dd 100644 --- a/django_stubs_ext/setup.py +++ b/django_stubs_ext/setup.py @@ -11,7 +11,7 @@ dependencies = [ setup( name="django-stubs-ext", - version="0.1.0", + version="0.2.0", description="Monkey-patching and extensions for django-stubs", long_description=readme, long_description_content_type="text/markdown", @@ -19,6 +19,8 @@ setup( url="https://github.com/typeddjango/django-stubs", author="Simula Proxy", author_email="3nki.nam.shub@gmail.com", + maintainer="Nikita Sobolev", + maintainer_email="mail@sobolevn.me", py_modules=[], python_requires=">=3.6", install_requires=dependencies, @@ -35,6 +37,7 @@ setup( "Framework :: Django :: 2.2", "Framework :: Django :: 3.0", "Framework :: Django :: 3.1", + "Framework :: Django :: 3.2", ], project_urls={ "Release notes": "https://github.com/typeddjango/django-stubs/releases", diff --git a/django_stubs_ext/tests/test_monkeypatching.py b/django_stubs_ext/tests/test_monkeypatching.py index f47374b..6a265d7 100644 --- a/django_stubs_ext/tests/test_monkeypatching.py +++ b/django_stubs_ext/tests/test_monkeypatching.py @@ -71,10 +71,11 @@ def test_patched_version_specific( assert el.cls[int] is el.cls -def test_patched_mypy_builtins(make_generic_classes: _MakeGenericClasses) -> None: +def test_patched_mypy_builtins( + make_generic_classes: _MakeGenericClasses, +) -> None: + """Ensures that we properly patch builtins with `mypy` specific helpers.""" make_generic_classes() assert builtins.reveal_type assert builtins.reveal_locals - - reveal_type(reveal_locals) # noqa: F821 diff --git a/setup.py b/setup.py index 13d56e8..95d0b49 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,7 @@ setup( "Framework :: Django :: 2.2", "Framework :: Django :: 3.0", "Framework :: Django :: 3.1", + "Framework :: Django :: 3.2", ], project_urls={ "Release notes": "https://github.com/typeddjango/django-stubs/releases",