[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/coaster/assets.py

@@ -35,11 +35,11 @@
 
 # Version is not used here but is made available for others to import from
 __all__ = [
-    'Version',
-    'SimpleSpec',
-    'VersionedAssets',
     'AssetNotFound',
     'AssetNotFoundError',
+    'SimpleSpec',
+    'Version',
+    'VersionedAssets',
     'WebpackManifest',
 ]
 

src/coaster/auth.py

@@ -31,10 +31,10 @@
 __all__ = [
     'CurrentAuth',
     'GetCurrentAuth',
-    'add_auth_attribute',
     'add_auth_anchor',
-    'request_has_auth',
+    'add_auth_attribute',
     'current_auth',
+    'request_has_auth',
 ]
 
 

src/coaster/compat.py

@@ -116,31 +116,30 @@
     'SansIoRequest',
     'SansIoResponse',
     'abort',
-    'app_ctx_object',
     'app_ctx',
+    'app_ctx_object',
     'async_make_response',
-    'async_render_template_string',
     'async_render_template',
+    'async_render_template_string',
     'async_request',
-    'current_app_object',
     'current_app',
+    'current_app_object',
     'ensure_sync',
     'g',
     'has_app_context',
     'has_request_context',
+    'json',
     'json_dump',
     'json_dumps',
     'json_load',
     'json_loads',
-    'json',
     'jsonify',
     'make_response',
     'redirect',
-    'render_template_string',
     'render_template',
-    'request_ctx',
-    'request_ctx',
+    'render_template_string',
     'request',
+    'request_ctx',
     'session',
     'sync_await',
     'url_for',

src/coaster/sqlalchemy/annotations.py

@@ -57,7 +57,7 @@ def get(cls, **kwargs):
 
 from ..signals import coaster_signals
 
-__all__ = ['annotations_configured', 'annotation_wrapper']
+__all__ = ['annotation_wrapper', 'annotations_configured']
 
 # Global dictionary for temporary storage of annotations until the
 # mapper_configured events

src/coaster/sqlalchemy/comparators.py

@@ -15,9 +15,9 @@
 __all__ = [
     'SplitIndexComparator',
     'SqlSplitIdComparator',
-    'SqlUuidHexComparator',
-    'SqlUuidB64Comparator',
     'SqlUuidB58Comparator',
+    'SqlUuidB64Comparator',
+    'SqlUuidHexComparator',
 ]
 
 

src/coaster/sqlalchemy/functions.py

@@ -15,11 +15,11 @@
 from .query import relationship
 
 __all__ = [
-    'make_timestamp_columns',
-    'failsafe_add',
     'add_primary_relationship',
     'auto_init_default',
+    'failsafe_add',
     'idfilters',
+    'make_timestamp_columns',
 ]
 
 T = TypeVar('T')

src/coaster/sqlalchemy/immutable_annotation.py

@@ -10,7 +10,7 @@
 
 from .annotations import annotation_wrapper, annotations_configured
 
-__all__ = ['immutable', 'cached', 'ImmutableColumnError']
+__all__ = ['ImmutableColumnError', 'cached', 'immutable']
 
 
 immutable = annotation_wrapper(

src/coaster/sqlalchemy/markdown.py

@@ -12,7 +12,7 @@
 
 from ..utils import markdown as markdown_processor
 
-__all__ = ['MarkdownComposite', 'MarkdownColumn', 'markdown_column']
+__all__ = ['MarkdownColumn', 'MarkdownComposite', 'markdown_column']
 
 
 class MarkdownComposite(MutableComposite):

src/coaster/sqlalchemy/mixins.py

@@ -81,24 +81,24 @@ class MyModel(BaseMixin[int], Model):  # Integer serial primary key; alt: UUID
 from .roles import ActorType, RoleMixin, with_roles
 
 __all__ = [
-    'PkeyType',
-    'IdentityOptions',
-    'IdMixin',
-    'TimestampMixin',
-    'PermissionMixin',
-    'UrlDict',
-    'UrlForMixin',
-    'NoIdMixin',
+    'BaseIdNameMixin',
     'BaseMixin',
     'BaseNameMixin',
-    'BaseScopedNameMixin',
-    'BaseIdNameMixin',
     'BaseScopedIdMixin',
     'BaseScopedIdNameMixin',
+    'BaseScopedNameMixin',
     'CoordinatesMixin',
-    'UuidMixin',
-    'RoleMixin',
+    'IdMixin',
+    'IdentityOptions',
+    'NoIdMixin',
+    'PermissionMixin',
+    'PkeyType',
     'RegistryMixin',
+    'RoleMixin',
+    'TimestampMixin',
+    'UrlDict',
+    'UrlForMixin',
+    'UuidMixin',
 ]
 
 PkeyType = TypeVar('PkeyType', int, UUID, default=int)
@@ -703,7 +703,9 @@ class BaseNameMixin(BaseMixin[PkeyType, ActorType]):
             # Drop CHECK constraint first in case it was already present
             op.drop_constraint(tablename + '_name_check', tablename)
             # Create CHECK constraint
-            op.create_check_constraint(tablename + '_name_check', tablename, "name <> ''")
+            op.create_check_constraint(
+                tablename + '_name_check', tablename, "name <> ''"
+            )
     """
 
     #: Prevent use of these reserved names
@@ -834,7 +836,9 @@ class BaseScopedNameMixin(BaseMixin[PkeyType, ActorType]):
 
         class Event(BaseScopedNameMixin, Model):
             __tablename__ = 'event'
-            organizer_id: Mapped[int] = sa_orm.mapped_column(sa.ForeignKey('organizer.id'))
+            organizer_id: Mapped[int] = sa_orm.mapped_column(
+                sa.ForeignKey('organizer.id')
+            )
             organizer: Mapped[Organizer] = relationship(Organizer)
             parent = sa_orm.synonym('organizer')
             __table_args__ = (sa.UniqueConstraint('organizer_id', 'name'),)
@@ -851,7 +855,9 @@ class Event(BaseScopedNameMixin, Model):
             # Drop CHECK constraint first in case it was already present
             op.drop_constraint(tablename + '_name_check', tablename)
             # Create CHECK constraint
-            op.create_check_constraint(tablename + '_name_check', tablename, "name <> ''")
+            op.create_check_constraint(
+                tablename + '_name_check', tablename, "name <> ''"
+            )
     """
 
     #: Prevent use of these reserved names
@@ -1022,7 +1028,9 @@ class BaseIdNameMixin(BaseMixin[PkeyType, ActorType]):
             # Drop CHECK constraint first in case it was already present
             op.drop_constraint(tablename + '_name_check', tablename)
             # Create CHECK constraint
-            op.create_check_constraint(tablename + '_name_check', tablename, "name <> ''")
+            op.create_check_constraint(
+                tablename + '_name_check', tablename, "name <> ''"
+            )
     """
 
     #: Allow blank names after all?
@@ -1208,7 +1216,9 @@ class BaseScopedIdNameMixin(BaseScopedIdMixin[PkeyType, ActorType]):
 
         class Event(BaseScopedIdNameMixin, Model):
             __tablename__ = 'event'
-            organizer_id: Mapped[int] = sa_orm.mapped_column(sa.ForeignKey('organizer.id'))
+            organizer_id: Mapped[int] = sa_orm.mapped_column(
+                sa.ForeignKey('organizer.id')
+            )
             organizer: Mapped[Organizer] = relationship(Organizer)
             parent = sa_orm.synonym('organizer')
             __table_args__ = (sa.UniqueConstraint('organizer_id', 'url_id'),)
@@ -1225,7 +1235,9 @@ class Event(BaseScopedIdNameMixin, Model):
             # Drop CHECK constraint first in case it was already present
             op.drop_constraint(tablename + '_name_check', tablename)
             # Create CHECK constraint
-            op.create_check_constraint(tablename + '_name_check', tablename, "name <> ''")
+            op.create_check_constraint(
+                tablename + '_name_check', tablename, "name <> ''"
+            )
     """
 
     #: Allow blank names after all?

src/coaster/sqlalchemy/model.py

@@ -90,15 +90,15 @@ class Other(Model): ...
     from flask_sqlalchemy import SQLAlchemy as FlaskSQLAlchemy
 
 __all__ = [
+    'DeclarativeBase',  # From SQLAlchemy, re-exported for convenience
+    'ModelBase',
     'bigint',
-    'smallint',
     'int_pkey',
-    'uuid4_pkey',
+    'jsonb',
+    'smallint',
     'timestamp',
     'timestamp_now',
-    'jsonb',
-    'ModelBase',
-    'DeclarativeBase',  # From SQLAlchemy, re-exported for convenience
+    'uuid4_pkey',
 ]
 
 # --- SQLAlchemy type aliases ----------------------------------------------------------