Merge pull request #110 from DanielGrams/issue/109-isort

Add isort #109

.github/workflows/lint.yml

@@ -8,5 +8,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
+      - uses: jamescurtin/isort-action@master
       - uses: psf/black@stable
       - uses: TrueBrain/actions-flake8@v1.4.1

.isort.cfg

@@ -0,0 +1,4 @@
+[settings]
+profile = black
+multi_line_output = 3
+skip = env

.pre-commit-config.yaml

@@ -1,4 +1,9 @@
 repos:
+  - repo: https://github.com/pycqa/isort
+    rev: 5.6.3
+    hooks:
+      - id: isort
+        name: isort (python)
   - repo: https://github.com/psf/black
     rev: stable
     hooks:

.vscode/settings.json

@@ -1,13 +1,23 @@
 {
-    "python.pythonPath": "/Users/daniel/Projects/gsevpt/env/bin/python3",
+    "editor.formatOnSave": true,
+    "python.pythonPath": "./env/bin/python3",
     "python.formatting.provider": "black",
+    "python.sortImports.args": [
+        "-sp .isort.cfg"
+    ],
     "python.linting.enabled": true,
     "python.linting.pylintEnabled": false,
     "python.linting.flake8Enabled": true,
     "python.testing.pytestArgs": [
-        "tests", "--capture=sys"
+        "tests",
+        "--capture=sys"
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.nosetestsEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "[python]": {
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": true
+        }
+    }
 }

migrations/env.py

@@ -3,10 +3,8 @@ from __future__ import with_statement
 import logging
 from logging.config import fileConfig
 
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-
 from alembic import context
+from sqlalchemy import engine_from_config, pool
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

migrations/versions/00daa8c472ba_.py

@@ -5,11 +5,11 @@ Revises: 50337ecd23db
 Create Date: 2020-10-27 20:58:57.392619
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "00daa8c472ba"

migrations/versions/021f602d9965_.py

@@ -5,9 +5,10 @@ Revises: 92f37474ad62
 Create Date: 2020-10-22 17:59:27.823624
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
+from alembic import op
+
 from project import dbtypes
 from project.models import EventRejectionReason, EventReviewStatus
 

migrations/versions/091deace5f08_.py

@@ -5,11 +5,10 @@ Revises: 6b7016f73688
 Create Date: 2020-10-02 09:29:12.932229
 
 """
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.sql import text
+from alembic import op
 from geoalchemy2.types import Geometry
-
+from sqlalchemy.sql import text
 
 # revision identifiers, used by Alembic.
 revision = "091deace5f08"

migrations/versions/0a282a331e35_.py

@@ -5,11 +5,11 @@ Revises: da63ba1d58b1
 Create Date: 2020-10-18 11:55:12.315808
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "0a282a331e35"

migrations/versions/1fb9f679defb_.py

@@ -5,11 +5,11 @@ Revises: b1a6e7630185
 Create Date: 2021-02-07 17:54:44.257540
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "1fb9f679defb"

migrations/versions/27da3ceea723_.py

@@ -5,10 +5,9 @@ Revises: 00daa8c472ba
 Create Date: 2020-11-08 16:14:01.866196
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "27da3ceea723"

migrations/versions/31b60d93351d_.py

@@ -5,11 +5,11 @@ Revises: 3c5b34fd1156
 Create Date: 2020-12-12 13:48:34.244288
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "31b60d93351d"

migrations/versions/35a6577b6af8_.py

@@ -5,11 +5,11 @@ Revises: a0a248667cd8
 Create Date: 2021-01-25 10:37:41.116909
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "35a6577b6af8"

migrations/versions/3c5b34fd1156_.py

@@ -5,13 +5,14 @@ Revises: 27da3ceea723
 Create Date: 2020-11-08 19:11:32.132404
 
 """
-from alembic import op
 import sqlalchemy as sa
-from sqlalchemy import orm
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
+from sqlalchemy import orm
 from sqlalchemy.ext.declarative import declarative_base
 
+from project import dbtypes
+
 # revision identifiers, used by Alembic.
 revision = "3c5b34fd1156"
 down_revision = "27da3ceea723"

migrations/versions/41512b20e07c_.py

@@ -5,11 +5,11 @@ Revises: fd7794ece0b3
 Create Date: 2020-07-17 19:54:25.703175
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "41512b20e07c"

migrations/versions/4e913af88c33_.py

@@ -5,11 +5,11 @@ Revises: 67216b6cf293
 Create Date: 2020-09-18 15:04:03.359403
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "4e913af88c33"

migrations/versions/50337ecd23db_.py

@@ -5,11 +5,11 @@ Revises: 6be822396123
 Create Date: 2020-10-27 20:31:42.566357
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "50337ecd23db"

migrations/versions/51c47c7f0bdb_.py

@@ -5,9 +5,8 @@ Revises: 7afc40e11791
 Create Date: 2020-09-29 15:38:44.033998
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "51c47c7f0bdb"

migrations/versions/5c8457f2eac1_.py

@@ -5,9 +5,8 @@ Revises: ed6bb2084bbd
 Create Date: 2020-07-13 19:01:04.770613
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "5c8457f2eac1"

migrations/versions/62e071b0da50_.py

@@ -5,11 +5,11 @@ Revises: dcd0b71650b0
 Create Date: 2020-07-30 13:13:44.694716
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "62e071b0da50"

migrations/versions/67216b6cf293_.py

@@ -5,12 +5,12 @@ Revises: a336ac384c64
 Create Date: 2020-08-01 15:43:11.377833
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
+
 from project import dbtypes
 from project.models import EventRejectionReason, EventReviewStatus
 
-
 # revision identifiers, used by Alembic.
 revision = "67216b6cf293"
 down_revision = "a336ac384c64"

migrations/versions/699c4f6a7fe8_.py

@@ -5,11 +5,11 @@ Revises: b1c05324cc13
 Create Date: 2020-07-28 16:29:41.403957
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "699c4f6a7fe8"

migrations/versions/6b7016f73688_.py

@@ -5,12 +5,13 @@ Revises: a75bd9c8ad3a
 Create Date: 2020-10-01 11:09:16.765736
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
+from project import dbtypes
+
 # revision identifiers, used by Alembic.
 revision = "6b7016f73688"
 down_revision = "a75bd9c8ad3a"

migrations/versions/6be822396123_.py

@@ -5,12 +5,13 @@ Revises: 021f602d9965
 Create Date: 2020-10-23 15:51:36.330825
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
+from project import dbtypes
+
 # revision identifiers, used by Alembic.
 revision = "6be822396123"
 down_revision = "021f602d9965"

migrations/versions/75c07cb9cfe3_.py

@@ -5,10 +5,9 @@ Revises: abf0f671ba27
 Create Date: 2020-07-07 10:11:08.217831
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "75c07cb9cfe3"

migrations/versions/7afc40e11791_.py

@@ -5,12 +5,12 @@ Revises: a8c662c46047
 Create Date: 2020-09-28 10:38:46.424791
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
+
 from project import dbtypes
 from project.models import FeaturedEventRejectionReason, FeaturedEventReviewStatus
 
-
 # revision identifiers, used by Alembic.
 revision = "7afc40e11791"
 down_revision = "a8c662c46047"

migrations/versions/7b105c6e08bf_.py

@@ -5,11 +5,11 @@ Revises: dddeceadde74
 Create Date: 2020-12-30 17:38:19.511314
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "7b105c6e08bf"

migrations/versions/8f4df40a36f3_.py

@@ -5,11 +5,11 @@ Revises: f71c86333bfb
 Create Date: 2020-09-24 18:53:02.861732
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "8f4df40a36f3"

migrations/versions/92f37474ad62_.py

@@ -5,9 +5,8 @@ Revises: 0a282a331e35
 Create Date: 2020-10-18 13:06:47.639083
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "92f37474ad62"

migrations/versions/975c22ae802b_.py

@@ -5,11 +5,11 @@ Revises: 5c8457f2eac1
 Create Date: 2020-07-17 11:27:53.084732
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "975c22ae802b"

migrations/versions/a0a248667cd8_.py

@@ -5,12 +5,12 @@ Revises: e33f225323f3
 Create Date: 2021-01-18 15:02:58.354511
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
-from project.models import EventTargetGroupOrigin, EventAttendanceMode
 
+from project import dbtypes
+from project.models import EventAttendanceMode, EventTargetGroupOrigin
 
 # revision identifiers, used by Alembic.
 revision = "a0a248667cd8"

migrations/versions/a336ac384c64_.py

@@ -5,11 +5,11 @@ Revises: 62e071b0da50
 Create Date: 2020-07-31 16:30:19.185088
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "a336ac384c64"

migrations/versions/a75bd9c8ad3a_.py

@@ -5,10 +5,11 @@ Revises: 51c47c7f0bdb
 Create Date: 2020-09-29 16:53:02.520125
 
 """
-from alembic import op
 import sqlalchemy as sa
-from project import dbtypes
+from alembic import op
 from sqlalchemy.dialects import postgresql
+
+from project import dbtypes
 from project.models import (
     EventReferenceRequestRejectionReason,
     EventReferenceRequestReviewStatus,

migrations/versions/a8c662c46047_.py

@@ -5,11 +5,11 @@ Revises: 8f4df40a36f3
 Create Date: 2020-09-25 11:26:03.139800
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "a8c662c46047"

migrations/versions/abf0f671ba27_.py

@@ -5,10 +5,9 @@ Revises: bbad7e33a780
 Create Date: 2020-06-30 21:09:35.692876
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "abf0f671ba27"

migrations/versions/b128cc637447_.py

@@ -5,11 +5,11 @@ Revises: 41512b20e07c
 Create Date: 2020-07-26 15:20:17.685921
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "b128cc637447"

migrations/versions/b1a6e7630185_.py

@@ -5,11 +5,11 @@ Revises: 35a6577b6af8
 Create Date: 2021-01-25 11:38:36.483434
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "b1a6e7630185"

migrations/versions/b1c05324cc13_.py

@@ -5,11 +5,11 @@ Revises: cce1284874fa
 Create Date: 2020-07-26 16:08:39.066127
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "b1c05324cc13"

migrations/versions/bbad7e33a780_.py

@@ -5,9 +5,8 @@ Revises:
 Create Date: 2020-06-24 21:17:25.548159
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "bbad7e33a780"

migrations/versions/cce1284874fa_.py

@@ -5,11 +5,11 @@ Revises: b128cc637447
 Create Date: 2020-07-26 15:48:47.723256
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "cce1284874fa"

migrations/versions/da63ba1d58b1_.py

@@ -5,11 +5,11 @@ Revises: 091deace5f08
 Create Date: 2020-10-04 17:06:54.502012
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "da63ba1d58b1"

migrations/versions/dcd0b71650b0_.py

@@ -5,11 +5,11 @@ Revises: 699c4f6a7fe8
 Create Date: 2020-07-28 17:10:49.606513
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "dcd0b71650b0"

migrations/versions/dddeceadde74_.py

@@ -5,12 +5,13 @@ Revises: 31b60d93351d
 Create Date: 2020-12-30 16:44:29.013647
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
+from project import dbtypes
+
 # revision identifiers, used by Alembic.
 revision = "dddeceadde74"
 down_revision = "31b60d93351d"

migrations/versions/e33f225323f3_.py

@@ -5,11 +5,11 @@ Revises: 7b105c6e08bf
 Create Date: 2020-12-30 17:59:47.917389
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "e33f225323f3"

migrations/versions/ed6bb2084bbd_.py

@@ -5,9 +5,8 @@ Revises: f1bc3fa623c7
 Create Date: 2020-07-08 08:53:44.373606
 
 """
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "ed6bb2084bbd"

migrations/versions/f1bc3fa623c7_.py

@@ -5,10 +5,11 @@ Revises: 75c07cb9cfe3
 Create Date: 2020-07-07 15:49:58.653888
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
+
 from project import dbtypes
-from project.models import EventTargetGroupOrigin, EventAttendanceMode, EventStatus
+from project.models import EventAttendanceMode, EventStatus, EventTargetGroupOrigin
 
 # revision identifiers, used by Alembic.
 revision = "f1bc3fa623c7"

migrations/versions/f71c86333bfb_.py

@@ -5,11 +5,11 @@ Revises: 4e913af88c33
 Create Date: 2020-09-18 15:27:37.608869
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "f71c86333bfb"

migrations/versions/fd7794ece0b3_.py

@@ -5,11 +5,11 @@ Revises: 975c22ae802b
 Create Date: 2020-07-17 19:51:08.457429
 
 """
-from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
-from project import dbtypes
+from alembic import op
 
+from project import dbtypes
 
 # revision identifiers, used by Alembic.
 revision = "fd7794ece0b3"

project/__init__.py

@@ -1,17 +1,16 @@
 import os
-from flask import Flask, url_for, redirect, request, jsonify
+
-from flask_sqlalchemy import SQLAlchemy
+from flask import Flask, jsonify, redirect, request, url_for
-from flask_security import (
-    Security,
-    SQLAlchemySessionUserDatastore,
-)
 from flask_babelex import Babel
 from flask_cors import CORS
-from flask_qrcode import QRcode
+from flask_gzip import Gzip
 from flask_mail import Mail, email_dispatched
 from flask_migrate import Migrate
-from flask_gzip import Gzip
+from flask_qrcode import QRcode
+from flask_security import Security, SQLAlchemySessionUserDatastore
+from flask_sqlalchemy import SQLAlchemy
 from webargs import flaskparser
+
 from project.custom_session_interface import CustomSessionInterface
 
 # Create app
@@ -97,10 +96,11 @@ from project.jsonld import DateTimeEncoder
 
 app.json_encoder = DateTimeEncoder
 
-# Setup Flask-Security
-from project.models import User, Role
 from project.forms.security import ExtendedRegisterForm
 
+# Setup Flask-Security
+from project.models import Role, User
+
 user_datastore = SQLAlchemySessionUserDatastore(db.session, User, Role)
 security = Security(app, user_datastore, register_form=ExtendedRegisterForm)
 app.session_interface = CustomSessionInterface()
@@ -112,9 +112,14 @@ config_oauth(app)
 
 # Init misc modules
 
-from project import i10n
+# API Resources
-from project import jinja_filters
+import project.api
-from project import init_data
+import project.cli.dump
+
+# Command line
+import project.cli.event
+import project.cli.user
+from project import i10n, init_data, jinja_filters
 
 # Routes
 from project.views import (
@@ -123,17 +128,17 @@ from project.views import (
     admin_unit_member,
     admin_unit_member_invitation,
     api,
+    dump,
     event,
     event_date,
     event_place,
     event_suggestion,
-    dump,
     image,
     manage,
-    organizer,
     oauth,
     oauth2_client,
     oauth2_token,
+    organizer,
     planing,
     reference,
     reference_request,
@@ -143,13 +148,5 @@ from project.views import (
     widget,
 )
 
-# API Resources
-import project.api
-
-# Command line
-import project.cli.event
-import project.cli.dump
-import project.cli.user
-
 if __name__ == "__main__":  # pragma: no cover
     app.run()

project/access.py

@@ -1,12 +1,13 @@
 from flask import abort
 from flask_login import login_user
+from flask_principal import Permission
 from flask_security import current_user
 from flask_security.utils import FsPermNeed
-from flask_principal import Permission
-from project.models import AdminUnitMember, AdminUnit
-from project.services.admin_unit import get_member_for_admin_unit_by_user_id
 from sqlalchemy import and_
 
+from project.models import AdminUnit, AdminUnitMember
+from project.services.admin_unit import get_member_for_admin_unit_by_user_id
+
 
 def has_current_user_permission(permission):
     user_perm = Permission(FsPermNeed(permission))

project/api/__init__.py

@@ -1,16 +1,17 @@
-from flask_restful import Api
-from sqlalchemy.exc import IntegrityError
-from psycopg2.errorcodes import UNIQUE_VIOLATION, CHECK_VIOLATION
-from werkzeug.exceptions import HTTPException, UnprocessableEntity
-from marshmallow import ValidationError
-from project.utils import get_localized_scope
-from project import app
-from flask_marshmallow import Marshmallow
 from apispec import APISpec
-from apispec.ext.marshmallow import MarshmallowPlugin
-from flask_apispec.extension import FlaskApiSpec
-from flask import url_for
 from apispec.exceptions import DuplicateComponentNameError
+from apispec.ext.marshmallow import MarshmallowPlugin
+from flask import url_for
+from flask_apispec.extension import FlaskApiSpec
+from flask_marshmallow import Marshmallow
+from flask_restful import Api
+from marshmallow import ValidationError
+from psycopg2.errorcodes import CHECK_VIOLATION, UNIQUE_VIOLATION
+from sqlalchemy.exc import IntegrityError
+from werkzeug.exceptions import HTTPException, UnprocessableEntity
+
+from project import app
+from project.utils import get_localized_scope
 
 
 class RestApi(Api):
@@ -165,11 +166,11 @@ def add_oauth2_scheme_with_transport(insecure: bool):
 
 marshmallow_plugin.converter.add_attribute_function(enum_to_properties)
 
+import project.api.dump.resources
 import project.api.event.resources
 import project.api.event_category.resources
 import project.api.event_date.resources
 import project.api.event_reference.resources
-import project.api.dump.resources
 import project.api.organization.resources
 import project.api.organizer.resources
 import project.api.place.resources

project/api/dump/resources.py

@@ -1,8 +1,9 @@
+from flask_apispec import doc, marshal_with
+
 from project.api import add_api_resource
-from flask_apispec import marshal_with, doc
+from project.api.dump.schemas import DumpResponseSchema
 from project.api.resources import BaseResource
 from project.api.schemas import NoneSchema
-from project.api.dump.schemas import DumpResponseSchema
 
 
 class DumpResource(BaseResource):

project/api/dump/schemas.py

@@ -1,13 +1,14 @@
-from project.api import marshmallow
 from marshmallow import fields
+
+from project.api import marshmallow
 from project.api.event.schemas import EventDumpSchema
-from project.api.place.schemas import PlaceDumpSchema
-from project.api.location.schemas import LocationDumpSchema
 from project.api.event_category.schemas import EventCategoryDumpSchema
-from project.api.organizer.schemas import OrganizerDumpSchema
-from project.api.image.schemas import ImageDumpSchema
-from project.api.organization.schemas import OrganizationDumpSchema
 from project.api.event_reference.schemas import EventReferenceDumpSchema
+from project.api.image.schemas import ImageDumpSchema
+from project.api.location.schemas import LocationDumpSchema
+from project.api.organization.schemas import OrganizationDumpSchema
+from project.api.organizer.schemas import OrganizerDumpSchema
+from project.api.place.schemas import PlaceDumpSchema
 
 
 class DumpResponseSchema(marshmallow.Schema):

project/api/event/resources.py

@@ -1,32 +1,33 @@
-from project.api import add_api_resource
+from authlib.integrations.flask_oauth2 import current_token
 from flask import make_response
-from flask_apispec import marshal_with, doc, use_kwargs
+from flask_apispec import doc, marshal_with, use_kwargs
-from project.api.resources import BaseResource
+from sqlalchemy.orm import lazyload, load_only
+
+from project import db
+from project.access import access_or_401, login_api_user_or_401
+from project.api import add_api_resource
 from project.api.event.schemas import (
-    EventSchema,
     EventListRequestSchema,
     EventListResponseSchema,
+    EventPatchRequestSchema,
+    EventPostRequestSchema,
+    EventSchema,
     EventSearchRequestSchema,
     EventSearchResponseSchema,
-    EventPostRequestSchema,
-    EventPatchRequestSchema,
 )
 from project.api.event_date.schemas import (
     EventDateListRequestSchema,
     EventDateListResponseSchema,
 )
+from project.api.resources import BaseResource
 from project.models import Event, EventDate
+from project.oauth2 import require_oauth
 from project.services.event import (
-    get_events_query,
     get_event_with_details_or_404,
+    get_events_query,
     update_event,
 )
 from project.services.event_search import EventSearchParams
-from sqlalchemy.orm import lazyload, load_only
-from project.oauth2 import require_oauth
-from authlib.integrations.flask_oauth2 import current_token
-from project import db
-from project.access import access_or_401, login_api_user_or_401
 from project.views.event import send_referenced_event_changed_mails
 
 

project/api/event/schemas.py

@@ -1,34 +1,35 @@
-from project.api import marshmallow
+from dateutil.rrule import rrulestr
-from marshmallow import fields, validate, ValidationError
+from marshmallow import ValidationError, fields, validate
 from marshmallow_enum import EnumField
-from project.models import (
+
-    Event,
+from project.api import marshmallow
-    EventStatus,
+from project.api.event_category.schemas import (
-    EventTargetGroupOrigin,
+    EventCategoryIdSchema,
-    EventAttendanceMode,
+    EventCategoryRefSchema,
-)
+    EventCategoryWriteIdSchema,
-from project.api.schemas import (
-    SQLAlchemyBaseSchema,
-    IdSchemaMixin,
-    TrackableSchemaMixin,
-    PaginationRequestSchema,
-    PaginationResponseSchema,
 )
+from project.api.fields import CustomDateTimeField
+from project.api.image.schemas import ImageSchema
 from project.api.organization.schemas import OrganizationRefSchema
 from project.api.organizer.schemas import OrganizerRefSchema, OrganizerWriteIdSchema
-from project.api.image.schemas import ImageSchema
 from project.api.place.schemas import (
     PlaceRefSchema,
     PlaceSearchItemSchema,
     PlaceWriteIdSchema,
 )
-from project.api.event_category.schemas import (
+from project.api.schemas import (
-    EventCategoryRefSchema,
+    IdSchemaMixin,
-    EventCategoryIdSchema,
+    PaginationRequestSchema,
-    EventCategoryWriteIdSchema,
+    PaginationResponseSchema,
+    SQLAlchemyBaseSchema,
+    TrackableSchemaMixin,
+)
+from project.models import (
+    Event,
+    EventAttendanceMode,
+    EventStatus,
+    EventTargetGroupOrigin,
 )
-from project.api.fields import CustomDateTimeField
-from dateutil.rrule import rrulestr
 
 
 class EventModelSchema(SQLAlchemyBaseSchema):

project/api/event_category/resources.py

@@ -1,10 +1,11 @@
+from flask_apispec import doc, marshal_with, use_kwargs
+
 from project.api import add_api_resource
-from flask_apispec import marshal_with, doc, use_kwargs
-from project.api.resources import BaseResource
 from project.api.event_category.schemas import (
     EventCategoryListRequestSchema,
     EventCategoryListResponseSchema,
 )
+from project.api.resources import BaseResource
 from project.models import EventCategory
 
 

project/api/event_category/schemas.py

@@ -1,13 +1,14 @@
 from marshmallow import fields
+
 from project.api import marshmallow
-from project.models import EventCategory
 from project.api.schemas import (
-    SQLAlchemyBaseSchema,
     IdSchemaMixin,
     PaginationRequestSchema,
     PaginationResponseSchema,
+    SQLAlchemyBaseSchema,
     WriteIdSchemaMixin,
 )
+from project.models import EventCategory
 
 
 class EventCategoryModelSchema(SQLAlchemyBaseSchema):

project/api/event_date/resources.py

@@ -1,17 +1,18 @@
+from flask_apispec import doc, marshal_with, use_kwargs
+from sqlalchemy.orm import defaultload, lazyload
+
 from project.api import add_api_resource
-from flask_apispec import marshal_with, doc, use_kwargs
-from project.api.resources import BaseResource
 from project.api.event_date.schemas import (
-    EventDateSchema,
     EventDateListRequestSchema,
     EventDateListResponseSchema,
+    EventDateSchema,
     EventDateSearchRequestSchema,
     EventDateSearchResponseSchema,
 )
-from project.models import EventDate, Event
+from project.api.resources import BaseResource
+from project.models import Event, EventDate
 from project.services.event import get_event_dates_query
 from project.services.event_search import EventSearchParams
-from sqlalchemy.orm import defaultload, lazyload
 
 
 class EventDateListResource(BaseResource):

project/api/event_date/schemas.py

@@ -1,12 +1,13 @@
-from project.api import marshmallow
 from marshmallow import fields
-from project.models import EventDate
+
+from project.api import marshmallow
 from project.api.event.schemas import (
     EventRefSchema,
     EventSearchItemSchema,
     EventSearchRequestSchema,
 )
 from project.api.schemas import PaginationRequestSchema, PaginationResponseSchema
+from project.models import EventDate
 
 
 class EventDateSchema(marshmallow.SQLAlchemySchema):

project/api/event_reference/resources.py

@@ -1,7 +1,8 @@
+from flask_apispec import doc, marshal_with
+
 from project.api import add_api_resource
-from flask_apispec import marshal_with, doc
-from project.api.resources import BaseResource
 from project.api.event_reference.schemas import EventReferenceSchema
+from project.api.resources import BaseResource
 from project.models import EventReference
 
 

project/api/event_reference/schemas.py

@@ -1,9 +1,10 @@
 from marshmallow import fields
+
 from project.api import marshmallow
-from project.models import EventReference
-from project.api.schemas import PaginationRequestSchema, PaginationResponseSchema
 from project.api.event.schemas import EventRefSchema
 from project.api.organization.schemas import OrganizationRefSchema
+from project.api.schemas import PaginationRequestSchema, PaginationResponseSchema
+from project.models import EventReference
 
 
 class EventReferenceIdSchema(marshmallow.SQLAlchemySchema):

project/api/fields.py

@@ -1,4 +1,5 @@
-from marshmallow import fields, ValidationError
+from marshmallow import ValidationError, fields
+
 from project.dateutils import berlin_tz
 
 

project/api/location/schemas.py

@@ -1,8 +1,9 @@
-from marshmallow import validate, validates_schema, ValidationError
+from marshmallow import ValidationError, validate, validates_schema
+
 from project.api import marshmallow
-from project.models import Location
 from project.api.fields import NumericStr
 from project.api.schemas import SQLAlchemyBaseSchema
+from project.models import Location
 
 
 class LocationModelSchema(SQLAlchemyBaseSchema):

project/api/organization/resources.py

@@ -1,59 +1,60 @@
-from project.api import add_api_resource
-from flask_apispec import marshal_with, doc, use_kwargs
-from project.api.resources import BaseResource
-from project.api.organization.schemas import (
-    OrganizationSchema,
-    OrganizationListRequestSchema,
-    OrganizationListResponseSchema,
-)
-from project.models import AdminUnit, Event
-from project.api.event_date.schemas import (
-    EventDateSearchRequestSchema,
-    EventDateSearchResponseSchema,
-)
-from project.api.event.schemas import (
-    EventSearchRequestSchema,
-    EventSearchResponseSchema,
-    EventListRequestSchema,
-    EventListResponseSchema,
-    EventPostRequestSchema,
-    EventIdSchema,
-)
-from project.api.organizer.schemas import (
-    OrganizerListRequestSchema,
-    OrganizerListResponseSchema,
-    OrganizerIdSchema,
-    OrganizerPostRequestSchema,
-)
-from project.api.event_reference.schemas import (
-    EventReferenceListRequestSchema,
-    EventReferenceListResponseSchema,
-)
-from project.services.reference import (
-    get_reference_incoming_query,
-    get_reference_outgoing_query,
-)
-from project.api.place.schemas import (
-    PlaceListRequestSchema,
-    PlaceListResponseSchema,
-    PlaceIdSchema,
-    PlacePostRequestSchema,
-)
-from project.services.event import get_event_dates_query, get_events_query, insert_event
-from project.services.event_search import EventSearchParams
-from project.services.admin_unit import (
-    get_admin_unit_query,
-    get_organizer_query,
-    get_place_query,
-)
-from project.oauth2 import require_oauth
 from authlib.integrations.flask_oauth2 import current_token
+from flask_apispec import doc, marshal_with, use_kwargs
+
 from project import db
 from project.access import (
     access_or_401,
     get_admin_unit_for_manage_or_404,
     login_api_user_or_401,
 )
+from project.api import add_api_resource
+from project.api.event.schemas import (
+    EventIdSchema,
+    EventListRequestSchema,
+    EventListResponseSchema,
+    EventPostRequestSchema,
+    EventSearchRequestSchema,
+    EventSearchResponseSchema,
+)
+from project.api.event_date.schemas import (
+    EventDateSearchRequestSchema,
+    EventDateSearchResponseSchema,
+)
+from project.api.event_reference.schemas import (
+    EventReferenceListRequestSchema,
+    EventReferenceListResponseSchema,
+)
+from project.api.organization.schemas import (
+    OrganizationListRequestSchema,
+    OrganizationListResponseSchema,
+    OrganizationSchema,
+)
+from project.api.organizer.schemas import (
+    OrganizerIdSchema,
+    OrganizerListRequestSchema,
+    OrganizerListResponseSchema,
+    OrganizerPostRequestSchema,
+)
+from project.api.place.schemas import (
+    PlaceIdSchema,
+    PlaceListRequestSchema,
+    PlaceListResponseSchema,
+    PlacePostRequestSchema,
+)
+from project.api.resources import BaseResource
+from project.models import AdminUnit, Event
+from project.oauth2 import require_oauth
+from project.services.admin_unit import (
+    get_admin_unit_query,
+    get_organizer_query,
+    get_place_query,
+)
+from project.services.event import get_event_dates_query, get_events_query, insert_event
+from project.services.event_search import EventSearchParams
+from project.services.reference import (
+    get_reference_incoming_query,
+    get_reference_outgoing_query,
+)
 
 
 class OrganizationResource(BaseResource):

project/api/organization/schemas.py

@@ -1,9 +1,10 @@
 from marshmallow import fields
+
 from project.api import marshmallow
-from project.models import AdminUnit
-from project.api.location.schemas import LocationSchema
 from project.api.image.schemas import ImageSchema
+from project.api.location.schemas import LocationSchema
 from project.api.schemas import PaginationRequestSchema, PaginationResponseSchema
+from project.models import AdminUnit
 
 
 class OrganizationIdSchema(marshmallow.SQLAlchemySchema):

project/api/organizer/resources.py

@@ -1,17 +1,18 @@
-from project.api import add_api_resource
-from flask import make_response
-from flask_apispec import marshal_with, doc, use_kwargs
-from project.api.resources import BaseResource
-from project.api.organizer.schemas import (
-    OrganizerSchema,
-    OrganizerPostRequestSchema,
-    OrganizerPatchRequestSchema,
-)
-from project.models import EventOrganizer
-from project.oauth2 import require_oauth
 from authlib.integrations.flask_oauth2 import current_token
+from flask import make_response
+from flask_apispec import doc, marshal_with, use_kwargs
+
 from project import db
 from project.access import access_or_401, login_api_user_or_401
+from project.api import add_api_resource
+from project.api.organizer.schemas import (
+    OrganizerPatchRequestSchema,
+    OrganizerPostRequestSchema,
+    OrganizerSchema,
+)
+from project.api.resources import BaseResource
+from project.models import EventOrganizer
+from project.oauth2 import require_oauth
 
 
 class OrganizerResource(BaseResource):

project/api/organizer/schemas.py

@@ -1,21 +1,22 @@
 from marshmallow import fields, validate
+
 from project.api import marshmallow
-from project.models import EventOrganizer
-from project.api.location.schemas import (
-    LocationSchema,
-    LocationPostRequestSchema,
-    LocationPatchRequestSchema,
-)
 from project.api.image.schemas import ImageSchema
+from project.api.location.schemas import (
+    LocationPatchRequestSchema,
+    LocationPostRequestSchema,
+    LocationSchema,
+)
 from project.api.organization.schemas import OrganizationRefSchema
 from project.api.schemas import (
-    SQLAlchemyBaseSchema,
     IdSchemaMixin,
-    WriteIdSchemaMixin,
-    TrackableSchemaMixin,
     PaginationRequestSchema,
     PaginationResponseSchema,
+    SQLAlchemyBaseSchema,
+    TrackableSchemaMixin,
+    WriteIdSchemaMixin,
 )
+from project.models import EventOrganizer
 
 
 class OrganizerModelSchema(SQLAlchemyBaseSchema):

project/api/place/resources.py

@@ -1,17 +1,18 @@
-from project.api import add_api_resource
-from flask import make_response
-from flask_apispec import marshal_with, doc, use_kwargs
-from project.api.resources import BaseResource
-from project.api.place.schemas import (
-    PlaceSchema,
-    PlacePostRequestSchema,
-    PlacePatchRequestSchema,
-)
-from project.models import EventPlace
-from project.oauth2 import require_oauth
 from authlib.integrations.flask_oauth2 import current_token
+from flask import make_response
+from flask_apispec import doc, marshal_with, use_kwargs
+
 from project import db
 from project.access import access_or_401, login_api_user_or_401
+from project.api import add_api_resource
+from project.api.place.schemas import (
+    PlacePatchRequestSchema,
+    PlacePostRequestSchema,
+    PlaceSchema,
+)
+from project.api.resources import BaseResource
+from project.models import EventPlace
+from project.oauth2 import require_oauth
 
 
 class PlaceResource(BaseResource):

project/api/place/schemas.py

@@ -1,22 +1,23 @@
 from marshmallow import fields, validate
+
 from project.api import marshmallow
-from project.models import EventPlace
 from project.api.image.schemas import ImageSchema
 from project.api.location.schemas import (
+    LocationPatchRequestSchema,
+    LocationPostRequestSchema,
     LocationSchema,
     LocationSearchItemSchema,
-    LocationPostRequestSchema,
-    LocationPatchRequestSchema,
 )
 from project.api.organization.schemas import OrganizationRefSchema
 from project.api.schemas import (
-    SQLAlchemyBaseSchema,
     IdSchemaMixin,
-    WriteIdSchemaMixin,
-    TrackableSchemaMixin,
     PaginationRequestSchema,
     PaginationResponseSchema,
+    SQLAlchemyBaseSchema,
+    TrackableSchemaMixin,
+    WriteIdSchemaMixin,
 )
+from project.models import EventPlace
 
 
 class PlaceModelSchema(SQLAlchemyBaseSchema):

project/api/resources.py

@@ -1,7 +1,9 @@
+from functools import wraps
+
 from flask import request
 from flask_apispec import marshal_with
 from flask_apispec.views import MethodResource
-from functools import wraps
+
 from project import db
 from project.api.schemas import ErrorResponseSchema, UnprocessableEntityResponseSchema
 

project/api/schemas.py

@@ -1,5 +1,6 @@
+from marshmallow import fields, missing, validate
+
 from project.api import marshmallow
-from marshmallow import fields, validate, missing
 
 
 class SQLAlchemyBaseSchema(marshmallow.SQLAlchemySchema):

project/cli/dump.py

@@ -1,28 +1,30 @@
-import click
-from flask.cli import AppGroup
-from project import app, dump_path
-from project.models import (
-    Event,
-    EventPlace,
-    EventReference,
-    Location,
-    EventCategory,
-    EventOrganizer,
-    Image,
-    AdminUnit,
-)
-from sqlalchemy.orm import joinedload
 import json
-from project.api.event.schemas import EventDumpSchema
-from project.api.place.schemas import PlaceDumpSchema
-from project.api.location.schemas import LocationDumpSchema
-from project.api.event_category.schemas import EventCategoryDumpSchema
-from project.api.organizer.schemas import OrganizerDumpSchema
-from project.api.image.schemas import ImageDumpSchema
-from project.api.organization.schemas import OrganizationDumpSchema
-from project.api.event_reference.schemas import EventReferenceDumpSchema
 import os
 import shutil
+
+import click
+from flask.cli import AppGroup
+from sqlalchemy.orm import joinedload
+
+from project import app, dump_path
+from project.api.event.schemas import EventDumpSchema
+from project.api.event_category.schemas import EventCategoryDumpSchema
+from project.api.event_reference.schemas import EventReferenceDumpSchema
+from project.api.image.schemas import ImageDumpSchema
+from project.api.location.schemas import LocationDumpSchema
+from project.api.organization.schemas import OrganizationDumpSchema
+from project.api.organizer.schemas import OrganizerDumpSchema
+from project.api.place.schemas import PlaceDumpSchema
+from project.models import (
+    AdminUnit,
+    Event,
+    EventCategory,
+    EventOrganizer,
+    EventPlace,
+    EventReference,
+    Image,
+    Location,
+)
 from project.utils import make_dir
 
 dump_cli = AppGroup("dump")

project/cli/event.py

@@ -1,5 +1,6 @@
 import click
 from flask.cli import AppGroup
+
 from project import app, db
 from project.services.event import (
     get_recurring_events,

project/cli/user.py

@@ -1,5 +1,6 @@
 import click
 from flask.cli import AppGroup
+
 from project import app, db
 from project.services.user import add_admin_roles_to_user
 

project/dateutils.py

@@ -1,7 +1,8 @@
-import pytz
-from dateutil.rrule import rrulestr
 from datetime import datetime
+
+import pytz
 from dateutil.relativedelta import relativedelta
+from dateutil.rrule import rrulestr
 
 berlin_tz = pytz.timezone("Europe/Berlin")
 now = datetime.now(tz=berlin_tz)

project/dbtypes.py

@@ -1,5 +1,5 @@
-from sqlalchemy.types import TypeDecorator
 from sqlalchemy import Integer
+from sqlalchemy.types import TypeDecorator
 
 
 class IntegerEnum(TypeDecorator):

project/forms/admin.py

@@ -1,7 +1,8 @@
-from flask_wtf import FlaskForm
 from flask_babelex import lazy_gettext
-from wtforms import TextAreaField, SubmitField, BooleanField
+from flask_wtf import FlaskForm
+from wtforms import BooleanField, SubmitField, TextAreaField
 from wtforms.validators import Optional
+
 from project.forms.widgets import MultiCheckboxField
 
 

project/forms/admin_unit.py

@@ -1,16 +1,12 @@
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
-from wtforms import (
+from wtforms import DecimalField, FormField, StringField, SubmitField
-    StringField,
-    SubmitField,
-    DecimalField,
-    FormField,
-)
 from wtforms.fields.html5 import EmailField, TelField, URLField
 from wtforms.validators import DataRequired, Optional, Regexp
 from wtforms.widgets.html5 import ColorInput
-from project.models import Location, Image
+
 from project.forms.common import Base64ImageForm
+from project.models import Image, Location
 
 
 class AdminUnitLocationForm(FlaskForm):

project/forms/admin_unit_member.py

@@ -3,6 +3,7 @@ from flask_wtf import FlaskForm
 from wtforms import SubmitField
 from wtforms.fields.html5 import EmailField
 from wtforms.validators import DataRequired
+
 from project.forms.widgets import MultiCheckboxField
 
 

project/forms/common.py

@@ -1,11 +1,12 @@
+import base64
+import re
+
 from flask import url_for
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
-from wtforms import StringField, HiddenField
-from wtforms.validators import Optional
 from markupsafe import Markup
-import re
+from wtforms import HiddenField, StringField
-import base64
+from wtforms.validators import Optional
 
 
 class BaseImageForm(FlaskForm):

project/forms/event.py

@@ -1,31 +1,32 @@
+from dateutil.relativedelta import relativedelta
 from flask import request
-from flask_babelex import lazy_gettext, gettext
+from flask_babelex import gettext, lazy_gettext
 from flask_wtf import FlaskForm
 from wtforms import (
-    SelectMultipleField,
+    BooleanField,
+    FormField,
+    IntegerField,
     RadioField,
+    SelectField,
+    SelectMultipleField,
     StringField,
     SubmitField,
     TextAreaField,
-    SelectField,
-    BooleanField,
-    IntegerField,
-    FormField,
 )
 from wtforms.fields.html5 import EmailField, URLField
 from wtforms.validators import DataRequired, Optional
+
+from project.forms.common import Base64ImageForm, event_rating_choices
+from project.forms.widgets import CustomDateField, CustomDateTimeField
 from project.models import (
-    EventPlace,
-    EventTargetGroupOrigin,
     EventAttendanceMode,
-    EventStatus,
-    Location,
     EventOrganizer,
+    EventPlace,
+    EventStatus,
+    EventTargetGroupOrigin,
     Image,
+    Location,
 )
-from project.forms.common import event_rating_choices, Base64ImageForm
-from project.forms.widgets import CustomDateTimeField, CustomDateField
-from dateutil.relativedelta import relativedelta
 
 
 class EventPlaceLocationForm(FlaskForm):

project/forms/event_date.py

@@ -1,13 +1,9 @@
 from flask import request
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
-from wtforms import (
+from wtforms import HiddenField, SelectField, StringField, SubmitField
-    HiddenField,
-    StringField,
-    SubmitField,
-    SelectField,
-)
 from wtforms.validators import Optional
+
 from project.forms.common import distance_choices
 from project.forms.widgets import CustomDateField
 

project/forms/event_place.py

@@ -1,16 +1,11 @@
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
-from wtforms import (
+from wtforms import DecimalField, FormField, StringField, SubmitField, TextAreaField
-    DecimalField,
-    StringField,
-    SubmitField,
-    TextAreaField,
-    FormField,
-)
 from wtforms.fields.html5 import URLField
 from wtforms.validators import DataRequired, Optional
-from project.models import Location, Image
+
 from project.forms.common import Base64ImageForm
+from project.models import Image, Location
 
 
 class EventPlaceLocationForm(FlaskForm):

project/forms/event_suggestion.py

@@ -1,23 +1,24 @@
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
 from wtforms import (
+    BooleanField,
+    SelectField,
     SelectMultipleField,
     StringField,
     SubmitField,
-    SelectField,
-    BooleanField,
 )
 from wtforms.fields.html5 import EmailField, TelField
 from wtforms.validators import DataRequired, Optional
-from project.models import (
+
-    EventRejectionReason,
-    Image,
-    EventTargetGroupOrigin,
-    EventAttendanceMode,
-)
 from project.forms.common import get_accept_tos_markup
-from project.forms.widgets import TagSelectField
 from project.forms.event import SharedEventForm
+from project.forms.widgets import TagSelectField
+from project.models import (
+    EventAttendanceMode,
+    EventRejectionReason,
+    EventTargetGroupOrigin,
+    Image,
+)
 
 
 class CreateEventSuggestionForm(SharedEventForm):

project/forms/oauth2_client.py

@@ -1,12 +1,14 @@
-from flask_wtf import FlaskForm
-from flask_babelex import lazy_gettext
-from wtforms import StringField, TextAreaField, SubmitField, SelectField
-from wtforms.validators import Optional, DataRequired
-from project.forms.widgets import MultiCheckboxField
-from project.api import scopes
-from project.utils import split_by_crlf
 import os
 
+from flask_babelex import lazy_gettext
+from flask_wtf import FlaskForm
+from wtforms import SelectField, StringField, SubmitField, TextAreaField
+from wtforms.validators import DataRequired, Optional
+
+from project.api import scopes
+from project.forms.widgets import MultiCheckboxField
+from project.utils import split_by_crlf
+
 
 class BaseOAuth2ClientForm(FlaskForm):
     client_name = StringField(lazy_gettext("Client name"), validators=[DataRequired()])

project/forms/oauth2_token.py

@@ -1,5 +1,5 @@
-from flask_wtf import FlaskForm
 from flask_babelex import lazy_gettext
+from flask_wtf import FlaskForm
 from wtforms import SubmitField
 
 

project/forms/organizer.py

@@ -1,15 +1,11 @@
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
-from wtforms import (
+from wtforms import DecimalField, FormField, StringField, SubmitField
-    StringField,
-    SubmitField,
-    DecimalField,
-    FormField,
-)
 from wtforms.fields.html5 import EmailField, TelField, URLField
 from wtforms.validators import DataRequired, Optional
-from project.models import Location, Image
+
 from project.forms.common import Base64ImageForm
+from project.models import Image, Location
 
 
 class OrganizerLocationForm(FlaskForm):

project/forms/planing.py

@@ -1,8 +1,9 @@
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
-from wtforms import HiddenField, StringField, SubmitField, SelectField
+from wtforms import HiddenField, SelectField, StringField, SubmitField
 from wtforms.validators import Optional
-from project.forms.common import weekday_choices, distance_choices
+
+from project.forms.common import distance_choices, weekday_choices
 from project.forms.widgets import CustomDateField, MultiCheckboxField
 
 

project/forms/reference.py

@@ -2,6 +2,7 @@ from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
 from wtforms import SelectField, StringField, SubmitField
 from wtforms.validators import DataRequired
+
 from project.forms.common import event_rating_choices
 
 

project/forms/reference_request.py

@@ -2,6 +2,7 @@ from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
 from wtforms import SelectField, StringField, SubmitField
 from wtforms.validators import DataRequired
+
 from project.forms.common import event_rating_choices
 from project.models import (
     EventReferenceRequestRejectionReason,

project/forms/security.py

@@ -1,9 +1,10 @@
-from flask_security.forms import RegisterForm, EqualTo, get_form_field_label
+from flask_babelex import lazy_gettext
+from flask_security.forms import EqualTo, RegisterForm, get_form_field_label
+from flask_wtf import FlaskForm
 from wtforms import BooleanField, PasswordField, SubmitField
 from wtforms.validators import DataRequired
+
 from project.forms.common import get_accept_tos_markup
-from flask_wtf import FlaskForm
-from flask_babelex import lazy_gettext
 
 
 class ExtendedRegisterForm(RegisterForm):

project/forms/widgets.py

@@ -1,9 +1,11 @@
-from wtforms import DateTimeField, SelectMultipleField, SelectField
-from wtforms.widgets import html_params, ListWidget, CheckboxInput
-from markupsafe import Markup
-from wtforms.validators import StopValidation
 from datetime import datetime
-from flask_babelex import to_user_timezone, gettext
+
+from flask_babelex import gettext, to_user_timezone
+from markupsafe import Markup
+from wtforms import DateTimeField, SelectField, SelectMultipleField
+from wtforms.validators import StopValidation
+from wtforms.widgets import CheckboxInput, ListWidget, html_params
+
 from project.dateutils import berlin_tz
 
 

project/i10n.py

@@ -1,6 +1,7 @@
-from project import app, babel
-from flask_babelex import gettext
 from flask import request
+from flask_babelex import gettext
+
+from project import app, babel
 
 
 @babel.localeselector

project/init_data.py

@@ -1,10 +1,11 @@
+import os
+
 from project import app, db
 from project.api import add_oauth2_scheme_with_transport
-from project.services.user import upsert_user_role
+from project.models import Location
 from project.services.admin_unit import upsert_admin_unit_member_role
 from project.services.event import upsert_event_category
-from project.models import Location
+from project.services.user import upsert_user_role
-import os
 
 
 @app.before_first_request

project/jinja_filters.py

@@ -1,11 +1,12 @@
+import os
+from urllib.parse import quote_plus
+
 from project import app
 from project.utils import (
     get_event_category_name,
     get_localized_enum_name,
     get_localized_scope,
 )
-from urllib.parse import quote_plus
-import os
 
 
 def env_override(value, key):

project/jsonld.py

@@ -1,8 +1,10 @@
 import datetime
 from json import JSONEncoder
+
 from flask import url_for
-from project.models import EventAttendanceMode, EventStatus
+
 from project.dateutils import berlin_tz
+from project.models import EventAttendanceMode, EventStatus
 
 
 class DateTimeEncoder(JSONEncoder):

project/models.py

@@ -1,37 +1,39 @@
-from project import db
-from project.utils import make_check_violation
-from sqlalchemy.ext.declarative import declared_attr
-from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm import relationship, backref, deferred, object_session
-from sqlalchemy.schema import CheckConstraint
-from sqlalchemy.event import listens_for
-from sqlalchemy import (
-    UniqueConstraint,
-    Boolean,
-    DateTime,
-    Column,
-    Integer,
-    String,
-    ForeignKey,
-    Unicode,
-    UnicodeText,
-    Numeric,
-)
-from sqlalchemy_utils import ColorType
-from flask_security import UserMixin, RoleMixin, current_user
-from flask_dance.consumer.storage.sqla import OAuthConsumerMixin
-from enum import IntEnum
 import datetime
-from project.dbtypes import IntegerEnum
+import time
-from geoalchemy2 import Geometry
+from enum import IntEnum
-from sqlalchemy import and_
+
 from authlib.integrations.sqla_oauth2 import (
-    OAuth2ClientMixin,
     OAuth2AuthorizationCodeMixin,
+    OAuth2ClientMixin,
     OAuth2TokenMixin,
 )
-import time
 from dateutil.relativedelta import relativedelta
+from flask_dance.consumer.storage.sqla import OAuthConsumerMixin
+from flask_security import RoleMixin, UserMixin, current_user
+from geoalchemy2 import Geometry
+from sqlalchemy import (
+    Boolean,
+    Column,
+    DateTime,
+    ForeignKey,
+    Integer,
+    Numeric,
+    String,
+    Unicode,
+    UnicodeText,
+    UniqueConstraint,
+    and_,
+)
+from sqlalchemy.event import listens_for
+from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import backref, deferred, object_session, relationship
+from sqlalchemy.schema import CheckConstraint
+from sqlalchemy_utils import ColorType
+
+from project import db
+from project.dbtypes import IntegerEnum
+from project.utils import make_check_violation
 
 # Base
 

project/oauth2.py

@@ -1,17 +1,15 @@
-from authlib.integrations.flask_oauth2 import (
+from authlib.integrations.flask_oauth2 import AuthorizationServer, ResourceProtector
-    AuthorizationServer,
-    ResourceProtector,
-)
 from authlib.integrations.sqla_oauth2 import (
-    create_query_client_func,
-    create_save_token_func,
     create_bearer_token_validator,
+    create_query_client_func,
     create_query_token_func,
+    create_save_token_func,
 )
 from authlib.oauth2.rfc6749 import grants
 from authlib.oauth2.rfc7636 import CodeChallenge
+
 from project import db
-from project.models import User, OAuth2Client, OAuth2AuthorizationCode, OAuth2Token
+from project.models import OAuth2AuthorizationCode, OAuth2Client, OAuth2Token, User
 
 
 class AuthorizationCodeGrant(grants.AuthorizationCodeGrant):

project/services/admin_unit.py

@@ -1,16 +1,17 @@
+from sqlalchemy import and_, func, or_
+
 from project import db
 from project.models import (
     AdminUnit,
     AdminUnitMember,
-    AdminUnitMemberRole,
     AdminUnitMemberInvitation,
+    AdminUnitMemberRole,
     EventOrganizer,
     EventPlace,
     Location,
 )
-from project.services.location import assign_location_values
 from project.services.image import upsert_image_with_data
-from sqlalchemy import func, and_, or_
+from project.services.location import assign_location_values
 
 
 def insert_admin_unit_for_user(admin_unit, user):

project/services/event.py

@@ -1,24 +1,21 @@
+from dateutil.relativedelta import relativedelta
+from sqlalchemy import and_, func, or_
+from sqlalchemy.orm import contains_eager, defaultload, joinedload
+from sqlalchemy.sql import extract
+
 from project import db
+from project.dateutils import date_add_time, dates_from_recurrence_rule, today
 from project.models import (
     AdminUnit,
-    EventCategory,
     Event,
+    EventCategory,
     EventDate,
     EventOrganizer,
-    EventReference,
     EventPlace,
+    EventReference,
     Image,
     Location,
 )
-from project.dateutils import (
-    dates_from_recurrence_rule,
-    today,
-    date_add_time,
-)
-from sqlalchemy import and_, or_, func
-from sqlalchemy.sql import extract
-from sqlalchemy.orm import joinedload, contains_eager, defaultload
-from dateutil.relativedelta import relativedelta
 
 
 def get_event_category(category_name):