isort pass

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile = black

README.md

@@ -129,6 +129,13 @@ repository, and the results are hosted on the
     (conbench) $ git add foo.py
 
 
+### Sort imports (before committing)
+    (conbench) $ cd ~/workspace/conbench/
+    (conbench) $ isort .
+        Fixing foo.py
+    (conbench) $ git add foo.py
+
+
 ### Lint code (before committing)
     (qa) $ cd ~/workspace/conbench/
     (qa) $ flake8

conbench/api/__init__.py

@@ -1,6 +1,5 @@
 import flask as f
 
-
 api = f.Blueprint("api", __name__)
 rule = api.add_url_rule
 

conbench/api/_docs.py

@@ -5,7 +5,6 @@
 from ..api import _examples as ex
 from ..config import Config
 
-
 spec = apispec.APISpec(
     title=Config.APPLICATION_NAME,
     version="1.0.0",

conbench/api/_endpoint.py

@@ -2,8 +2,8 @@
 import os
 
 import flask as f
-import flask_login
 import flask.views
+import flask_login
 
 
 def as_bool(x):

conbench/api/_google.py

@@ -1,6 +1,7 @@
-import flask as f
 import json
 import os
+
+import flask as f
 import requests
 
 

conbench/api/auth.py

@@ -4,9 +4,7 @@
 import flask_login
 import marshmallow
 
-
-from ..api import _google
-from ..api import rule
+from ..api import _google, rule
 from ..api._docs import spec
 from ..api._endpoint import ApiEndpoint
 from ..api.users import User

conbench/api/benchmarks.py

@@ -1,7 +1,6 @@
 import flask as f
 import flask_login
 
-
 from ..api import rule
 from ..api._docs import spec
 from ..api._endpoint import ApiEndpoint, maybe_login_required

conbench/api/compare.py

@@ -1,6 +1,5 @@
 import flask as f
 
-
 from ..api import rule
 from ..api._endpoint import ApiEndpoint, maybe_login_required
 from ..entities._comparator import BenchmarkComparator, BenchmarkListComparator

conbench/api/history.py

@@ -1,7 +1,7 @@
 from ..api import rule
 from ..api._endpoint import ApiEndpoint, maybe_login_required
 from ..entities._entity import NotFound
-from ..entities.history import get_history, HistorySerializer
+from ..entities.history import HistorySerializer, get_history
 from ..entities.summary import Summary
 
 

conbench/api/users.py

@@ -1,7 +1,6 @@
 import flask_login
 import marshmallow
 
-
 from ..api import rule
 from ..api._docs import spec
 from ..api._endpoint import ApiEndpoint

conbench/app/__init__.py

@@ -1,14 +1,13 @@
 import flask as f
 
-
 app = f.Blueprint("app", __name__)
 rule = app.add_url_rule
 
 
-from .index import *  # noqa
 from .auth import *  # noqa
 from .batches import *  # noqa
 from .benchmarks import *  # noqa
 from .compare import *  # noqa
+from .index import *  # noqa
 from .runs import *  # noqa
 from .users import *  # noqa

conbench/app/_plots.py

@@ -1,7 +1,7 @@
-import dateutil
 import json
 
 import bokeh.plotting
+import dateutil
 
 from ..hacks import sorted_data
 

conbench/app/compare.py

@@ -1,12 +1,12 @@
 import copy
-import flask as f
 import json
 
 import bokeh
+import flask as f
 
 from ..app import rule
 from ..app._endpoint import AppEndpoint
-from ..app._plots import simple_bar_plot, TimeSeriesPlotMixin
+from ..app._plots import TimeSeriesPlotMixin, simple_bar_plot
 from ..app.benchmarks import BenchmarkMixin, RunMixin
 from ..config import Config
 

conbench/cli.py

@@ -2,10 +2,9 @@
 
 import click
 
-from .runner import REGISTRY, LIST
+from .runner import LIST, REGISTRY
 from .util import register_benchmarks
 
-
 register_benchmarks()
 BENCHMARKS = {}
 for benchmark in REGISTRY:

conbench/config.py

@@ -1,6 +1,5 @@
-import os
 import getpass
-
+import os
 
 APPLICATION_NAME = "Conbench"
 

conbench/db.py

@@ -1,7 +1,5 @@
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session
-from sqlalchemy.orm import sessionmaker
-
+from sqlalchemy.orm import scoped_session, sessionmaker
 
 engine = None
 session_maker = sessionmaker(future=True)

conbench/entities/_comparator.py

@@ -2,7 +2,6 @@
 
 from ..units import formatter_for_unit
 
-
 CHANGE = 5.0  # percent changed threshold
 Z_SCORE = 5.0  # z-score threshold
 

conbench/entities/_entity.py

@@ -8,7 +8,6 @@
 
 from ..db import Session
 
-
 Base = declarative_base()
 NotNull = functools.partial(Column, nullable=False)
 Nullable = functools.partial(Column, nullable=True)

conbench/entities/case.py

@@ -1,7 +1,7 @@
 import sqlalchemy as s
 from sqlalchemy.dialects import postgresql
 
-from ..entities._entity import Base, EntityMixin, generate_uuid, NotNull
+from ..entities._entity import Base, EntityMixin, NotNull, generate_uuid
 
 
 class Case(Base, EntityMixin):

conbench/entities/commit.py

@@ -11,9 +11,9 @@
     Base,
     EntityMixin,
     EntitySerializer,
-    generate_uuid,
     NotNull,
     Nullable,
+    generate_uuid,
 )
 
 

conbench/entities/context.py

@@ -6,8 +6,8 @@
     Base,
     EntityMixin,
     EntitySerializer,
-    generate_uuid,
     NotNull,
+    generate_uuid,
 )
 
 

conbench/entities/data.py

@@ -1,7 +1,7 @@
 import sqlalchemy as s
 from sqlalchemy import CheckConstraint as check
 
-from ..entities._entity import Base, EntityMixin, generate_uuid, NotNull
+from ..entities._entity import Base, EntityMixin, NotNull, generate_uuid
 
 
 class Data(Base, EntityMixin):

conbench/entities/distribution.py

@@ -1,17 +1,11 @@
 import sqlalchemy as s
-from sqlalchemy import func
 from sqlalchemy import CheckConstraint as check
+from sqlalchemy import func
 from sqlalchemy.dialects.postgresql import insert
 
 from ..db import Session
-from ..entities._entity import (
-    Base,
-    EntityMixin,
-    generate_uuid,
-    NotNull,
-    Nullable,
-)
 from ..entities._comparator import _less_is_better
+from ..entities._entity import Base, EntityMixin, NotNull, Nullable, generate_uuid
 from ..entities.commit import Commit
 from ..entities.machine import Machine
 from ..entities.run import Run

conbench/entities/machine.py

@@ -1,16 +1,16 @@
 import flask as f
 import marshmallow
 import sqlalchemy as s
-from sqlalchemy import func
 from sqlalchemy import CheckConstraint as check
+from sqlalchemy import func
 from sqlalchemy.ext.hybrid import hybrid_property
 
 from ..entities._entity import (
     Base,
     EntityMixin,
     EntitySerializer,
-    generate_uuid,
     NotNull,
+    generate_uuid,
 )
 
 

conbench/entities/summary.py

@@ -6,18 +6,18 @@
 from sqlalchemy import CheckConstraint as check
 from sqlalchemy.orm import relationship
 
+from ..entities._comparator import z_improvement, z_regression
 from ..entities._entity import (
     Base,
     EntityMixin,
     EntitySerializer,
-    generate_uuid,
     NotNull,
     Nullable,
+    generate_uuid,
 )
-from ..entities._comparator import z_improvement, z_regression
 from ..entities.case import Case
-from ..entities.context import Context
 from ..entities.commit import Commit, get_github_commit, repository_to_url
+from ..entities.context import Context
 from ..entities.data import Data
 from ..entities.distribution import update_distribution
 from ..entities.machine import Machine, MachineSchema

conbench/entities/time.py

@@ -1,7 +1,7 @@
 import sqlalchemy as s
 from sqlalchemy import CheckConstraint as check
 
-from ..entities._entity import Base, EntityMixin, generate_uuid, NotNull
+from ..entities._entity import Base, EntityMixin, NotNull, generate_uuid
 
 
 class Time(Base, EntityMixin):

conbench/entities/user.py

@@ -8,8 +8,8 @@
     Base,
     EntityMixin,
     EntitySerializer,
-    generate_uuid,
     NotNull,
+    generate_uuid,
 )
 from ..extensions import login_manager
 

conbench/extensions.py

@@ -1,6 +1,5 @@
 import flask_bootstrap
 import flask_login
 
-
 login_manager = flask_login.LoginManager()
 bootstrap = flask_bootstrap.Bootstrap()

conbench/runner.py

@@ -13,7 +13,6 @@
 from .machine_info import github_info, machine_info, python_info, r_info
 from .util import Connection
 
-
 REGISTRY = []
 LIST = []
 

conbench/tests/api/_fixtures.py

@@ -3,7 +3,6 @@
 from ...entities.summary import Summary
 from ...runner import Conbench
 
-
 CHILD = "02addad336ba19a654f9c857ede546331be7b631"
 PARENT = "4beb514d071c9beec69b8917b5265e77ade22fb3"
 GRANDPARENT = "6d703c4c7b15be630af48d5e9ef61628751674b2"

conbench/tests/api/test_benchmarks.py

@@ -7,11 +7,9 @@
 from ...entities._entity import NotFound
 from ...entities.distribution import Distribution
 from ...entities.summary import Summary
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 from ...tests.helpers import _uuid
 
-
 ARROW_REPO = "https://github.com/apache/arrow"
 CONBENCH_REPO = "https://github.com/ursacomputing/conbench"
 

conbench/tests/api/test_commits.py

@@ -1,6 +1,5 @@
 from ...api._examples import _api_commit_entity
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 
 
 def _expected_entity(commit):

conbench/tests/api/test_compare.py

@@ -1,9 +1,7 @@
 from ...api._examples import _api_compare_entity, _api_compare_list
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 from ...tests.helpers import _uuid
 
-
 CASE = "snappy, cpu_count=2, parquet, arrow, nyctaxi_sample"
 
 

conbench/tests/api/test_contexts.py

@@ -1,6 +1,5 @@
 from ...api._examples import _api_context_entity
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 
 
 def _expected_entity(context):

conbench/tests/api/test_docs.py

@@ -6,7 +6,6 @@
 
 from ...tests.api import _asserts
 
-
 this_dir = os.path.abspath(os.path.dirname(__file__))
 
 

conbench/tests/api/test_history.py

@@ -1,6 +1,5 @@
 from ...api._examples import _api_history_entity
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 
 
 def _expected_entity(summary):

conbench/tests/api/test_machines.py

@@ -1,6 +1,5 @@
 from ...api._examples import _api_machine_entity
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 
 
 def _expected_entity(machine):

conbench/tests/api/test_runs.py

@@ -1,8 +1,7 @@
 import urllib
 
 from ...api._examples import _api_run_entity
-from ...tests.api import _asserts
-from ...tests.api import _fixtures
+from ...tests.api import _asserts, _fixtures
 from ...tests.helpers import _uuid