isort everything

algobowl/cli/config.py

@@ -1,13 +1,13 @@
 import dataclasses
 import os
-from pathlib import Path
 import sys
+from pathlib import Path
 
 import click
 import toml
 
-from algobowl.cli import formatter
 import algobowl.lib.problem as problemlib
+from algobowl.cli import formatter
 
 
 def get_default_config_path():

algobowl/cli/group.py

@@ -1,6 +1,6 @@
+import pathlib
 import re
 import sys
-import pathlib
 
 import click
 

algobowl/cli/problem.py

@@ -1,12 +1,12 @@
 import concurrent.futures
 import io
-from pathlib import Path
 import sys
+from pathlib import Path
 
 import click
 
-from algobowl.cli import formatter
 import algobowl.lib.problem as problemlib
+from algobowl.cli import formatter
 
 
 def _parse_input(cli, path: Path):

algobowl/config/app_cfg.py

@@ -5,17 +5,18 @@
 Configuration in this file is overridden by the paste config.
 """
 import tg
-import algobowl
+from depot.manager import DepotManager
+from markupsafe import Markup
 from repoze.who.interfaces import IChallenger
-from algobowl import model
-from algobowl.config.auth import AuthMetadata, TokenAuth, MPAPIAuthenticator, GoogleAuth
 from tg.configuration import AppConfig, milestones
 from tg.support.converters import asbool
 from tgext.admin.config import AdminConfig
 from tgext.admin.layouts import BootstrapAdminLayout
 from tgext.admin.widgets import BootstrapAdminTableFiller
-from depot.manager import DepotManager
-from markupsafe import Markup
+
+import algobowl
+from algobowl import model
+from algobowl.config.auth import AuthMetadata, GoogleAuth, MPAPIAuthenticator, TokenAuth
 
 base_config = AppConfig()
 base_config.renderers = []

algobowl/config/auth.py

@@ -1,18 +1,18 @@
 import os
+from urllib.parse import urlencode
 
-import tg
-import requests
-import transaction
 import google_auth_oauthlib.flow as gflow
 import googleapiclient.discovery as gdiscovery
-
-from urllib.parse import urlencode
-from webob import Request
+import requests
+import tg
+import transaction
+from repoze.who.interfaces import IAuthenticator, IChallenger, IIdentifier
+from tg.configuration.auth import TGAuthMetadata
 from tg.exceptions import HTTPFound
+from webob import Request
 from zope.interface import implementer
-from repoze.who.interfaces import IIdentifier, IAuthenticator, IChallenger
-from tg.configuration.auth import TGAuthMetadata
-from algobowl.model import AuthToken, User, DBSession
+
+from algobowl.model import AuthToken, DBSession, User
 
 
 class BaseAuth:

algobowl/config/middleware.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 """WSGI middleware initialization for the algobowl application."""
+from depot.manager import DepotManager
+
 from algobowl.config.app_cfg import base_config
 from algobowl.config.environment import load_environment
-from depot.manager import DepotManager
 
 __all__ = ["make_app"]
 

algobowl/controllers/api/user.py

@@ -2,8 +2,8 @@
 
 import tg
 
-from algobowl.lib import base
 from algobowl import model
+from algobowl.lib import base
 
 
 @dataclasses.dataclass

algobowl/controllers/competition.py

@@ -1,23 +1,25 @@
-import zipfile
 import datetime
-import algobowl.lib.problem as problemlib
-from io import StringIO, BytesIO
-from collections import namedtuple, defaultdict
+import zipfile
+from collections import defaultdict, namedtuple
+from io import BytesIO, StringIO
+
 from recordclass import recordclass
-from tg import expose, abort, request, response, flash, redirect, require
-from tg.predicates import has_permission
 from sqlalchemy.sql.expression import case
+from tg import abort, expose, flash, redirect, request, require, response
+from tg.predicates import has_permission
+
+import algobowl.lib.problem as problemlib
 from algobowl.lib.base import BaseController
 from algobowl.lib.logoutput import logoutput
 from algobowl.model import (
-    DBSession,
     Competition,
+    DBSession,
+    Evaluation,
+    Group,
     Input,
     Output,
-    Group,
-    VerificationStatus,
     Protest,
-    Evaluation,
+    VerificationStatus,
 )
 
 __all__ = ["CompetitionsController", "CompetitionController"]

algobowl/controllers/error.py

@@ -1,4 +1,5 @@
-from tg import request, expose
+from tg import expose, request
+
 from algobowl.lib.base import BaseController
 
 __all__ = ["ErrorController"]

algobowl/controllers/group.py

@@ -1,20 +1,21 @@
 import datetime
-import zipfile
 import re
-from io import StringIO, BytesIO
-from tg import expose, redirect, url, request, response, abort, flash, require
-from tg.predicates import not_anonymous, has_permission
+import zipfile
+from io import BytesIO, StringIO
+
 from depot.io.utils import FileIntent
+from tg import abort, expose, flash, redirect, request, require, response, url
+from tg.predicates import has_permission, not_anonymous
 
 import algobowl.lib.problem as problemlib
-from algobowl.lib.helpers import ftime
 from algobowl.lib.base import BaseController
+from algobowl.lib.helpers import ftime
 from algobowl.model import (
     DBSession,
+    Evaluation,
     Group,
     Input,
     Output,
-    Evaluation,
     VerificationStatus,
 )
 

algobowl/controllers/root.py

@@ -1,22 +1,20 @@
 import tg
-import algobowl.model
-from algobowl.model import DBSession
-from tg import expose, flash, require, url, lurl
-from tg import redirect, tmpl_context
-from tg import predicates
-from tg.exceptions import HTTPFound
 from repoze.who.api import get_api
+from tg import expose, flash, lurl, predicates, redirect, require, tmpl_context, url
+from tg.exceptions import HTTPFound
+from tgext.admin.controller import AdminController
 
-from algobowl.controllers import api
-import algobowl.controllers.setup as setup_controller
-import algobowl.controllers.pref as pref_controller
 import algobowl.controllers.file_redirector as file_redirector
+import algobowl.controllers.pref as pref_controller
+import algobowl.controllers.setup as setup_controller
+import algobowl.model
 from algobowl.config.app_cfg import AdminConfig
-from algobowl.lib.base import BaseController
-from tgext.admin.controller import AdminController
+from algobowl.controllers import api
+from algobowl.controllers.competition import CompetitionsController
 from algobowl.controllers.error import ErrorController
 from algobowl.controllers.group import GroupsController
-from algobowl.controllers.competition import CompetitionsController
+from algobowl.lib.base import BaseController
+from algobowl.model import DBSession
 
 __all__ = ["RootController"]
 

algobowl/lib/base.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 """The base Controller API."""
 
-from tg import TGController, tmpl_context
-from tg import request
-
+from tg import TGController, request, tmpl_context
 
 __all__ = ["BaseController"]
 

algobowl/lib/helpers.py

@@ -4,7 +4,8 @@
 
 This module is exposed in all templates under the name ``h``.
 """
-from datetime import datetime, date, time, timedelta
+from datetime import date, datetime, time, timedelta
+
 import tg
 
 

algobowl/lib/logoutput.py

@@ -1,6 +1,6 @@
-import io
 import contextlib
 import functools
+import io
 
 from tg import expose
 

algobowl/model.py

@@ -1,12 +1,12 @@
-import enum
 import datetime
+import enum
+
 import sqlalchemy as sa
 import tg
-from sqlalchemy.orm import relationship, relation
-from zope.sqlalchemy import register
-from sqlalchemy.orm import scoped_session, sessionmaker
-from sqlalchemy.ext.declarative import declarative_base
 from depot.fields.sqlalchemy import UploadedFileField
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relation, relationship, scoped_session, sessionmaker
+from zope.sqlalchemy import register
 
 maker = sessionmaker(autoflush=True, autocommit=False)
 DBSession = scoped_session(maker)

algobowl/websetup/__init__.py

@@ -1,7 +1,8 @@
 """Setup the algobowl application"""
 from algobowl.config.environment import load_environment
-from .schema import setup_schema
+
 from .bootstrap import bootstrap
+from .schema import setup_schema
 
 
 def setup_app(command, conf, vars):

algobowl/websetup/schema.py

@@ -2,8 +2,8 @@
 """Setup the algobowl application"""
 from __future__ import print_function
 
-from tg import config
 import transaction
+from tg import config
 
 
 def setup_schema(command, conf, vars):
@@ -14,7 +14,6 @@ def setup_schema(command, conf, vars):
     from algobowl import model
 
     # <websetup.websetup.schema.after.model.import>
-
     # <websetup.websetup.schema.before.metadata.create_all>
     print("Creating tables")
     model.metadata.create_all(bind=config["tg.app_globals"].sa_engine)

migration/env.py

@@ -1,4 +1,5 @@
 from __future__ import with_statement
+
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 

migration/versions/4f7581127c93_separate_competitions_and_problems.py

@@ -7,7 +7,6 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
 from depot.fields.sqlalchemy import UploadedFileField
 

migration/versions/819923a3acd9_add_incognito_groups.py

@@ -6,8 +6,8 @@
 
 """
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "819923a3acd9"

migration/versions/8d2d82cd68f4_benchmark.py

@@ -6,9 +6,8 @@
 
 """
 
-from alembic import op
 import sqlalchemy as sa
-
+from alembic import op
 
 # revision identifiers, used by Alembic.
 revision = "8d2d82cd68f4"