Fixes isort/black compatibility

.pre-commit-config.yaml

@@ -22,10 +22,10 @@ repos:
     -   id: check-ast
 # isort python package import sorting
 -   repo: https://github.com/pre-commit/mirrors-isort
-    rev: 'v5.10.1'
+    rev: 'v5.10.0'
     hooks:
     -   id: isort
-        args: ["--profile", "black", --line-length=100]
+        args: ["--profile", "black", --line-length=88]
 -   repo: https://github.com/pycqa/flake8
     rev: 5.0.4
     hooks:

contrib/setup.cfg

@@ -7,3 +7,5 @@ ignore =
     E501, # line too long \
     W503, # line break before binary operator \
     W605  # invalid escape sequence
+[isort]
+profile = black

examples/airflow/plugins/function_modules/data_loaders.py

@@ -11,7 +11,13 @@
 
 import pandas as pd
 
-from hamilton.function_modifiers import config, extract_columns, load_from, source, value
+from hamilton.function_modifiers import (
+    config,
+    extract_columns,
+    load_from,
+    source,
+    value,
+)
 
 data_columns = [
     "id",

examples/data_loaders/prep_data.py

@@ -1,6 +1,12 @@
 import pandas as pd
 
-from hamilton.function_modifiers import does, extract_columns, parameterize, source, value
+from hamilton.function_modifiers import (
+    does,
+    extract_columns,
+    parameterize,
+    source,
+    value,
+)
 
 
 def _sum_series(**series):

examples/data_quality/pandera/data_loaders.py

@@ -13,7 +13,13 @@
 
 import pandas as pd
 
-from hamilton.function_modifiers import config, extract_columns, load_from, source, value
+from hamilton.function_modifiers import (
+    config,
+    extract_columns,
+    load_from,
+    source,
+    value,
+)
 
 data_columns = [
     "id",

examples/data_quality/simple/data_loaders.py

@@ -11,7 +11,13 @@
 
 import pandas as pd
 
-from hamilton.function_modifiers import config, extract_columns, load_from, source, value
+from hamilton.function_modifiers import (
+    config,
+    extract_columns,
+    load_from,
+    source,
+    value,
+)
 
 data_columns = [
     "id",

examples/feast/default_feature_store/feature_repo/example_repo.py

@@ -3,7 +3,15 @@
 from datetime import timedelta
 
 import pandas as pd
-from feast import Entity, FeatureService, FeatureView, Field, FileSource, PushSource, RequestSource
+from feast import (
+    Entity,
+    FeatureService,
+    FeatureView,
+    Field,
+    FileSource,
+    PushSource,
+    RequestSource,
+)
 from feast.on_demand_feature_view import on_demand_feature_view
 from feast.types import Float32, Float64, Int64
 

hamilton/experimental/h_ray.py

@@ -1,6 +1,10 @@
 import logging
 
-from hamilton.plugins.h_ray import RayGraphAdapter, RayTaskExecutor, RayWorkflowGraphAdapter
+from hamilton.plugins.h_ray import (
+    RayGraphAdapter,
+    RayTaskExecutor,
+    RayWorkflowGraphAdapter,
+)
 
 logger = logging.getLogger(__name__)
 logger.warning(

hamilton/graph.py

@@ -8,7 +8,18 @@
 import logging
 from enum import Enum
 from types import ModuleType
-from typing import Any, Callable, Collection, Dict, FrozenSet, List, Optional, Set, Tuple, Type
+from typing import (
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    FrozenSet,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Type,
+)
 
 from hamilton import base, node
 from hamilton.execution import graph_functions

hamilton/plugins/h_spark.py

@@ -3,7 +3,18 @@
 import logging
 import sys
 from types import CodeType, FunctionType, ModuleType
-from typing import Any, Callable, Collection, Dict, List, Optional, Set, Tuple, Type, Union
+from typing import (
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Type,
+    Union,
+)
 
 import numpy as np
 import pandas as pd

hamilton/plugins/pandas_extensions.py

@@ -5,7 +5,18 @@
 from datetime import datetime
 from io import BufferedReader, BytesIO, StringIO
 from pathlib import Path
-from typing import Any, Callable, Collection, Dict, Iterator, List, Optional, Tuple, Type, Union
+from typing import (
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+)
 
 try:
     import pandas as pd

setup.cfg

@@ -7,3 +7,5 @@ ignore =
     E501, # line too long \
     W503, # line break before binary operator \
     W605  # invalid escape sequence
+[isort]
+profile = black

tests/execution/test_node_grouping.py

@@ -9,7 +9,11 @@
 )
 from hamilton.graph import FunctionGraph
 from hamilton.node import NodeType
-from tests.resources.dynamic_parallelism import no_parallel, parallel_complex, parallel_linear_basic
+from tests.resources.dynamic_parallelism import (
+    no_parallel,
+    parallel_complex,
+    parallel_linear_basic,
+)
 
 
 def test_group_individually():

tests/function_modifiers/test_macros.py

@@ -9,7 +9,12 @@
 from hamilton import base, driver, function_modifiers, models, node
 from hamilton.function_modifiers import does
 from hamilton.function_modifiers.dependencies import source, value
-from hamilton.function_modifiers.macros import Applicable, ensure_function_empty, pipe, step
+from hamilton.function_modifiers.macros import (
+    Applicable,
+    ensure_function_empty,
+    pipe,
+    step,
+)
 from hamilton.node import DependencyType
 
 

tests/plugins/test_plotly_extensions.py

@@ -3,7 +3,10 @@
 import plotly.graph_objects as go
 import pytest
 
-from hamilton.plugins.plotly_extensions import PlotlyInteractiveWriter, PlotlyStaticWriter
+from hamilton.plugins.plotly_extensions import (
+    PlotlyInteractiveWriter,
+    PlotlyStaticWriter,
+)
 
 
 @pytest.fixture

tests/plugins/test_sklearn_plot_extensions.py

@@ -8,7 +8,12 @@
 import sklearn.inspection as inspection
 import sklearn.metrics as metrics
 import sklearn.model_selection as model_selection
-from sklearn.datasets import load_diabetes, load_iris, make_classification, make_friedman1
+from sklearn.datasets import (
+    load_diabetes,
+    load_iris,
+    make_classification,
+    make_friedman1,
+)
 from sklearn.ensemble import GradientBoostingRegressor
 from sklearn.linear_model import LogisticRegression, Ridge
 from sklearn.model_selection import train_test_split

tests/resources/dq_dummy_examples.py

@@ -2,7 +2,11 @@
 
 import pandas as pd
 
-from hamilton.data_quality.base import BaseDefaultValidator, DataValidator, ValidationResult
+from hamilton.data_quality.base import (
+    BaseDefaultValidator,
+    DataValidator,
+    ValidationResult,
+)
 
 
 class SampleDataValidator1(BaseDefaultValidator):

tests/resources/dynamic_config.py

@@ -1,6 +1,12 @@
 import pandas as pd
 
-from hamilton.function_modifiers import ResolveAt, extract_columns, parameterize, resolve, source
+from hamilton.function_modifiers import (
+    ResolveAt,
+    extract_columns,
+    parameterize,
+    resolve,
+    source,
+)
 
 
 @extract_columns("a", "b", "c", "d", "e")