Merge pull request #601 from splitgraph/readd-isort

Readd isort

Author: mildbyte

.github/workflows/build_and_test_and_release.yml

@@ -30,6 +30,7 @@ jobs:
           key: pip_cache
       - name: "Run pre-commit hooks (typechecks and the formatter)"
         run: |
+          pip install -U pip
           pip install pre-commit
           # NB this uses mypy in .pre-commit-config.yaml
           pre-commit run --all-files

.pre-commit-config.yaml

@@ -20,9 +20,16 @@ repos:
           - types-tabulate
           - types-PyYAML
         exclude: "^(examples|test|docs)/"
-#
-#  - repo: https://github.com/pycqa/isort
-#    rev: 5.9.3
-#    hooks:
-#      - id: isort
-#        args: ["--profile", "black", "--filter-files"]
+
+  - repo: local
+    hooks:
+      - id: isort
+        name: isort
+        entry: isort
+        require_serial: true
+        language: python
+        language_version: python3
+        types_or: [cython, pyi, python]
+        args: ["--profile", "black", "--filter-files"]
+        minimum_pre_commit_version: '2.9.2'
+        additional_dependencies: ['isort==5.10.1']

docs/generate_reference.py

@@ -9,44 +9,46 @@
 
 import splitgraph.commandline as cmd
 from splitgraph.commandline.cloud import (
-    register_c,
-    login_c,
+    add_c,
     curl_c,
-    login_api_c,
-    sql_c as cloud_sql_c,
-    readme_c,
     description_c,
-    metadata_c,
-    search_c,
-    load_c,
+    download_c,
     dump_c,
-    add_c,
-    token_c,
-    status_c,
+    load_c,
+    login_api_c,
+    login_c,
     logs_c,
-    upload_c,
+    metadata_c,
+    plugins_c,
+    readme_c,
+    register_c,
+    search_c,
     seed_c,
-    validate_c,
+)
+from splitgraph.commandline.cloud import sql_c as cloud_sql_c
+from splitgraph.commandline.cloud import (
+    status_c,
     stub_c,
-    plugins_c,
     sync_c,
-    download_c,
+    token_c,
+    upload_c,
+    validate_c,
 )
 from splitgraph.commandline.engine import (
     add_engine_c,
+    configure_engine_c,
     delete_engine_c,
     list_engines_c,
+    log_engine_c,
     start_engine_c,
     stop_engine_c,
-    log_engine_c,
-    configure_engine_c,
     upgrade_engine_c,
     version_engine_c,
 )
 from splitgraph.commandline.ingestion import csv_export, csv_import
 
 # Map category to Click commands -- maybe eventually we'll read this dynamically...
-from splitgraph.config.keys import KEYS, KEY_DOCS, DEFAULTS
+from splitgraph.config.keys import DEFAULTS, KEY_DOCS, KEYS
 from splitgraph.ingestion.singer.commandline import singer_target
 
 STRUCTURE = [

examples/custom_fdw/src/hn_fdw/fdw.py

@@ -4,7 +4,7 @@
 import requests
 
 try:
-    from multicorn import ForeignDataWrapper, ANY
+    from multicorn import ANY, ForeignDataWrapper
 except ImportError:
     # Multicorn not installed (don't crash the import in this case if we want to unit test this.).
     ForeignDataWrapper = object

examples/custom_fdw/src/hn_fdw/mount.py

@@ -1,10 +1,6 @@
 from typing import Dict, Optional
 
-from splitgraph.core.types import (
-    TableColumn,
-    TableInfo,
-    IntrospectionResult,
-)
+from splitgraph.core.types import IntrospectionResult, TableColumn, TableInfo
 
 # Define the schema of the foreign table we wish to create
 # We're only going to be fetching stories, so limit the columns to the ones that

examples/dbt_adapter/dbt/adapters/splitgraph/__init__.py

@@ -1,5 +1,4 @@
 from dbt.adapters.base import AdapterPlugin
-
 from dbt.adapters.splitgraph.connections import SplitgraphCredentials
 from dbt.adapters.splitgraph.impl import SplitgraphAdapter
 from dbt.include import splitgraph

examples/dbt_adapter/dbt/adapters/splitgraph/connections.py

@@ -6,10 +6,10 @@
 from dbt.adapters.postgres import PostgresConnectionManager, PostgresCredentials
 from psycopg2.pool import AbstractConnectionPool
 
+from splitgraph.core.image_mounting import ImageMapper
 from splitgraph.core.repository import Repository
 from splitgraph.engine import switch_engine
 from splitgraph.engine.postgres.engine import PostgresEngine
-from splitgraph.core.image_mounting import ImageMapper
 
 
 @dataclass

examples/dbt_adapter/dbt/adapters/splitgraph/impl.py

@@ -1,5 +1,4 @@
 from dbt.adapters.postgres.impl import PostgresAdapter
-
 from dbt.adapters.splitgraph import SplitgraphConnectionManager
 
 

examples/dbt_adapter/setup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-from setuptools import find_namespace_packages
-from setuptools import setup
+from setuptools import find_namespace_packages, setup
 
 package_name = "dbt-splitgraph"
 package_version = "0.0.1"

examples/example_to_md.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import json
 import re
-from typing import List, Dict, Any
+from typing import Any, Dict, List
 
 import click