5.0: Update django.contrib.sitemaps, django.contrib.staticfiles (typeddjango#2076)

Author: sudosubin

django-stubs/contrib/sitemaps/__init__.pyi

@@ -8,12 +8,6 @@ from django.core.paginator import Paginator
 from django.db.models.base import Model
 from django.db.models.query import QuerySet
 
-PING_URL: str
-
-class SitemapNotFound(Exception): ...
-
-def ping_google(sitemap_url: str | None = ..., ping_url: str = ..., sitemap_uses_https: bool = ...) -> None: ...
-
 _ItemT = TypeVar("_ItemT")
 
 class Sitemap(Generic[_ItemT]):

django-stubs/contrib/sitemaps/management/__init__.pyi

@@ -1,10 +1,11 @@
 from typing import NoReturn
 
+from django.db.models.base import ModelBase
 from django.http.request import HttpRequest
 
 class RequestSite:
     name: str
     domain: str
     def __init__(self, request: HttpRequest) -> None: ...
-    def save(self, force_insert: bool = ..., force_update: bool = ...) -> NoReturn: ...
+    def save(self, force_insert: bool | tuple[ModelBase, ...] = ..., force_update: bool = ...) -> NoReturn: ...
     def delete(self) -> NoReturn: ...

django-stubs/contrib/sitemaps/management/commands/__init__.pyi

@@ -2,6 +2,9 @@ from collections.abc import Sequence
 from typing import Any
 
 from django.apps.config import AppConfig
-from django.core.checks.messages import CheckMessage
+from django.core.checks.messages import CheckMessage, Error
+
+E005: Error
 
 def check_finders(app_configs: Sequence[AppConfig] | None = ..., **kwargs: Any) -> list[CheckMessage]: ...
+def check_storages(app_configs: Sequence[AppConfig] | None = ..., **kwargs: Any) -> list[CheckMessage]: ...

django-stubs/contrib/sitemaps/management/commands/ping_google.pyi

@@ -17,7 +17,7 @@ class BaseFinder:
 class FileSystemFinder(BaseFinder):
     locations: list[tuple[str, str]]
     storages: dict[str, Any]
-    def __init__(self, app_names: Sequence[str] = ..., *args: Any, **kwargs: Any) -> None: ...
+    def __init__(self, app_names: Sequence[str] | None = ..., *args: Any, **kwargs: Any) -> None: ...
     def find_location(self, root: str, path: str, prefix: str | None = ...) -> str | None: ...
     @overload
     def find(self, path: str, all: Literal[False] = ...) -> str | None: ...

django-stubs/contrib/sites/requests.pyi

@@ -2,6 +2,7 @@ from typing import Any
 
 from django.core.files.storage import Storage
 from django.core.management.base import BaseCommand
+from django.utils.functional import cached_property
 
 class Command(BaseCommand):
     copied_files: Any
@@ -10,7 +11,7 @@ class Command(BaseCommand):
     post_processed_files: Any
     storage: Any
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    @property
+    @cached_property
     def local(self) -> bool: ...
     interactive: Any
     verbosity: Any
@@ -21,6 +22,7 @@ class Command(BaseCommand):
     post_process: Any
     def set_options(self, **options: Any) -> None: ...
     def collect(self) -> dict[str, list[str]]: ...
+    def handle(self, **options: Any) -> str | None: ...
     def log(self, msg: str, level: int = ...) -> None: ...
     def is_local_storage(self) -> bool: ...
     def clear_dir(self, path: str) -> None: ...

django-stubs/contrib/staticfiles/checks.pyi

@@ -1,3 +1,6 @@
+from typing import Any
+
 from django.core.management.base import LabelCommand
 
-class Command(LabelCommand): ...
+class Command(LabelCommand):
+    def handle_label(self, path: str, **options: Any) -> str | None: ...  # type: ignore[override]

django-stubs/contrib/staticfiles/finders.pyi

@@ -1,4 +1,5 @@
 from collections.abc import Callable, Iterator
+from re import Match
 from typing import Any
 
 from django.core.files.base import File
@@ -23,10 +24,12 @@ class HashedFilesMixin:
     hashed_files: Any
     keep_intermediate_files: bool
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    def file_hash(self, name: str, content: File = ...) -> str: ...
+    def file_hash(self, name: str, content: File | None = ...) -> str | None: ...
     def hashed_name(self, name: str, content: File | None = ..., filename: str | None = ...) -> str: ...
     def url(self, name: str, force: bool = ...) -> str: ...
-    def url_converter(self, name: str, hashed_files: dict[str, Any], template: str = ...) -> Callable: ...
+    def url_converter(
+        self, name: str, hashed_files: dict[str, Any], template: str | None = ...
+    ) -> Callable[[Match], str]: ...
     def post_process(self, paths: dict[str, Any], dry_run: bool = ..., **options: Any) -> _PostProcessT: ...
     def clean_name(self, name: str) -> str: ...
     def hash_key(self, name: str) -> str: ...
@@ -40,7 +43,7 @@ class ManifestFilesMixin(HashedFilesMixin):
     manifest_storage: Storage | None
     hashed_files: dict[str, str]
     manifest_hash: str
-    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    def __init__(self, *args: Any, manifest_storage: Storage | None = ..., **kwargs: Any) -> None: ...
     def read_manifest(self) -> str: ...
     def load_manifest(self) -> dict[str, Any]: ...
     def save_manifest(self) -> None: ...