Restore inner class Meta in models where it is accessible

django-stubs/contrib/admin/models.pyi

@@ -21,6 +21,7 @@ class LogEntryManager(models.Manager[LogEntry]):
     ) -> LogEntry: ...
 
 class LogEntry(models.Model):
+    # Note: do not create `class Meta` here.
     action_time: models.DateTimeField
     user: models.ForeignKey
     content_type: models.ForeignKey

django-stubs/contrib/auth/base_user.pyi

@@ -20,6 +20,9 @@ class AbstractBaseUser(models.Model):
     last_login = models.DateTimeField(blank=True, null=True)
     is_active: bool | BooleanField[bool | Combinable, bool]
 
+    class Meta:
+        abstract: bool
+
     def get_username(self) -> str: ...
     def natural_key(self) -> tuple[str]: ...
     @property

django-stubs/contrib/auth/models.pyi

@@ -20,6 +20,7 @@ class PermissionManager(models.Manager[Permission]):
     def get_by_natural_key(self, codename: str, app_label: str, model: str) -> Permission: ...
 
 class Permission(models.Model):
+    # Note: do not create `class Meta` here.
     content_type_id: int
     objects: ClassVar[PermissionManager]
 
@@ -32,6 +33,7 @@ class GroupManager(models.Manager[Group]):
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
+    # Note: do not create `class Meta` here.
     objects: ClassVar[GroupManager]
 
     name = models.CharField(max_length=150)
@@ -61,6 +63,9 @@ class PermissionsMixin(models.Model):
     groups = models.ManyToManyField(Group)
     user_permissions = models.ManyToManyField(Permission)
 
+    class Meta:
+        abstract: bool
+
     def get_user_permissions(self, obj: _AnyUser | None = ...) -> set[str]: ...
     def get_group_permissions(self, obj: _AnyUser | None = ...) -> set[str]: ...
     def get_all_permissions(self, obj: _AnyUser | None = ...) -> set[str]: ...
@@ -84,6 +89,11 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
     EMAIL_FIELD: str
     USERNAME_FIELD: str
 
+    class Meta:
+        verbose_name: str
+        verbose_name_plural: str
+        abstract: bool
+
     def get_full_name(self) -> str: ...
     def get_short_name(self) -> str: ...
     def email_user(

django-stubs/contrib/contenttypes/models.pyi

@@ -12,6 +12,7 @@ class ContentTypeManager(models.Manager[ContentType]):
     def clear_cache(self) -> None: ...
 
 class ContentType(models.Model):
+    # Note: do not create `class Meta` here.
     id: int
     app_label: models.CharField
     model: models.CharField

django-stubs/contrib/flatpages/models.pyi

@@ -2,6 +2,7 @@ from django.contrib.sites.models import Site
 from django.db import models
 
 class FlatPage(models.Model):
+    # Note: do not create `class Meta` here.
     url: models.CharField
     title: models.CharField
     content: models.TextField

django-stubs/contrib/redirects/models.pyi

@@ -1,6 +1,7 @@
 from django.db import models
 
 class Redirect(models.Model):
+    # Note: do not create `class Meta` here.
     site: models.ForeignKey
     old_path: models.CharField
     new_path: models.CharField

django-stubs/contrib/sessions/base_session.pyi

@@ -16,6 +16,11 @@ class AbstractBaseSession(models.Model):
     session_key: str
     objects: Any
 
+    class Meta:
+        verbose_name: str
+        verbose_name_plural: str
+        abstract: bool
+
     @classmethod
     def get_session_store_class(cls) -> type[SessionBase] | None: ...
     def get_decoded(self) -> dict[str, Any]: ...

django-stubs/contrib/sites/models.pyi

@@ -11,6 +11,7 @@ class SiteManager(models.Manager[Site]):
     def get_by_natural_key(self, domain: str) -> Site: ...
 
 class Site(models.Model):
+    # Note: do not create `class Meta` here.
     objects: ClassVar[SiteManager]
 
     domain = models.CharField(max_length=100)

scripts/stubtest/allowlist.txt

@@ -398,15 +398,10 @@ django.db.models.query_utils.Q.referenced_base_fields
 django.contrib.gis.db.models.Q.referenced_base_fields
 django.db.backends.oracle.features.DatabaseFeatures.django_test_skips
 
-# Ignore missing inner `Meta` class, see PR #2000 for the related discussion
-django.contrib.auth.base_user.AbstractBaseUser.Meta
+# Ignore missing inner `Meta` class, see PR #2000 and #2168
 django.contrib.auth.forms.BaseUserCreationForm.Meta
 django.contrib.auth.forms.UserChangeForm.Meta
-django.contrib.auth.models.AbstractBaseUser.Meta
-django.contrib.auth.models.AbstractUser.Meta
-django.contrib.auth.models.PermissionsMixin.Meta
 django.contrib.flatpages.forms.FlatpageForm.Meta
-django.contrib.sessions.base_session.AbstractBaseSession.Meta
 
 # Custom __str__ that we don't want to overcomplicate:
 django.forms.utils.RenderableMixin.__str__