From a3fff6f0e824991701e0d3667ccd382943790392 Mon Sep 17 00:00:00 2001 From: elijahbenizzy Date: Mon, 27 Nov 2023 22:32:42 -0800 Subject: [PATCH] Fixes isort/black compatibility --- .pre-commit-config.yaml | 4 ++-- contrib/setup.cfg | 2 ++ .../plugins/function_modules/data_loaders.py | 8 +++++++- examples/data_loaders/prep_data.py | 8 +++++++- examples/data_quality/pandera/data_loaders.py | 8 +++++++- examples/data_quality/simple/data_loaders.py | 8 +++++++- .../feature_repo/example_repo.py | 10 +++++++++- hamilton/experimental/h_ray.py | 6 +++++- hamilton/graph.py | 13 ++++++++++++- hamilton/plugins/h_spark.py | 13 ++++++++++++- hamilton/plugins/pandas_extensions.py | 13 ++++++++++++- setup.cfg | 2 ++ tests/execution/test_node_grouping.py | 6 +++++- tests/function_modifiers/test_macros.py | 7 ++++++- tests/plugins/test_plotly_extensions.py | 5 ++++- tests/plugins/test_sklearn_plot_extensions.py | 7 ++++++- tests/resources/dq_dummy_examples.py | 6 +++++- tests/resources/dynamic_config.py | 8 +++++++- 18 files changed, 117 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2bb775938..7b2903724 100644 --- a/.pre-commit-config.yaml +++ b/.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: diff --git a/contrib/setup.cfg b/contrib/setup.cfg index 26946c07b..05d56af48 100644 --- a/contrib/setup.cfg +++ b/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 diff --git a/examples/airflow/plugins/function_modules/data_loaders.py b/examples/airflow/plugins/function_modules/data_loaders.py index 66a6c40b5..695f9bdd5 100644 --- a/examples/airflow/plugins/function_modules/data_loaders.py +++ b/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", diff --git a/examples/data_loaders/prep_data.py b/examples/data_loaders/prep_data.py index 6df203e82..34d898ed7 100644 --- a/examples/data_loaders/prep_data.py +++ b/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): diff --git a/examples/data_quality/pandera/data_loaders.py b/examples/data_quality/pandera/data_loaders.py index 6f08138f6..aa91e9015 100644 --- a/examples/data_quality/pandera/data_loaders.py +++ b/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", diff --git a/examples/data_quality/simple/data_loaders.py b/examples/data_quality/simple/data_loaders.py index 7a8ee4ebd..3d4b6ff17 100644 --- a/examples/data_quality/simple/data_loaders.py +++ b/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", diff --git a/examples/feast/default_feature_store/feature_repo/example_repo.py b/examples/feast/default_feature_store/feature_repo/example_repo.py index 47f6a45c5..69528a745 100644 --- a/examples/feast/default_feature_store/feature_repo/example_repo.py +++ b/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 diff --git a/hamilton/experimental/h_ray.py b/hamilton/experimental/h_ray.py index bf870b890..6177258e3 100644 --- a/hamilton/experimental/h_ray.py +++ b/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( diff --git a/hamilton/graph.py b/hamilton/graph.py index 5cad228c5..2d30f3e6f 100644 --- a/hamilton/graph.py +++ b/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 diff --git a/hamilton/plugins/h_spark.py b/hamilton/plugins/h_spark.py index afcfaf2a2..a7a0ca99f 100644 --- a/hamilton/plugins/h_spark.py +++ b/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 diff --git a/hamilton/plugins/pandas_extensions.py b/hamilton/plugins/pandas_extensions.py index ff239be5f..dc86f4644 100644 --- a/hamilton/plugins/pandas_extensions.py +++ b/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 diff --git a/setup.cfg b/setup.cfg index 26946c07b..05d56af48 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,3 +7,5 @@ ignore = E501, # line too long \ W503, # line break before binary operator \ W605 # invalid escape sequence +[isort] +profile = black diff --git a/tests/execution/test_node_grouping.py b/tests/execution/test_node_grouping.py index 3418f3910..93c1e8fe8 100644 --- a/tests/execution/test_node_grouping.py +++ b/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(): diff --git a/tests/function_modifiers/test_macros.py b/tests/function_modifiers/test_macros.py index a9f834b0b..82f6f757b 100644 --- a/tests/function_modifiers/test_macros.py +++ b/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 diff --git a/tests/plugins/test_plotly_extensions.py b/tests/plugins/test_plotly_extensions.py index b3bcd3c32..3abf283cc 100644 --- a/tests/plugins/test_plotly_extensions.py +++ b/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 diff --git a/tests/plugins/test_sklearn_plot_extensions.py b/tests/plugins/test_sklearn_plot_extensions.py index 406207f09..d9992d172 100644 --- a/tests/plugins/test_sklearn_plot_extensions.py +++ b/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 diff --git a/tests/resources/dq_dummy_examples.py b/tests/resources/dq_dummy_examples.py index 223f8e614..00ea3e164 100644 --- a/tests/resources/dq_dummy_examples.py +++ b/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): diff --git a/tests/resources/dynamic_config.py b/tests/resources/dynamic_config.py index 6aa1ef3cd..a96c1e33b 100644 --- a/tests/resources/dynamic_config.py +++ b/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")