From 3e1c1a4170ab2af4558d6a6bc3290bfcecd7d341 Mon Sep 17 00:00:00 2001 From: ErdiTk <24619655+ErdiTk@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:30:27 +0100 Subject: [PATCH 1/2] Enabled ruff TCH on pandas/core/apply.py, pandas/core/base.py, pandas/core/algorithms.py, pandas/core/sorting.py and pandas/core/ops/*. Only for the last two items there were changes needed. --- pandas/core/ops/__init__.py | 11 ++++++----- pandas/core/ops/array_ops.py | 15 ++++++++++----- pandas/core/ops/common.py | 9 +++++++-- pandas/core/ops/dispatch.py | 10 +++++++--- pandas/core/sorting.py | 19 ++++++++++--------- pyproject.toml | 5 ----- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/pandas/core/ops/__init__.py b/pandas/core/ops/__init__.py index 64619fdc4b8d4..074779ece23cb 100644 --- a/pandas/core/ops/__init__.py +++ b/pandas/core/ops/__init__.py @@ -14,11 +14,7 @@ import numpy as np from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op -from pandas._typing import ( - Axis, - AxisInt, - Level, -) + from pandas.util._decorators import Appender from pandas.core.dtypes.common import ( @@ -75,6 +71,11 @@ ) if TYPE_CHECKING: + from pandas._typing import ( + Axis, + AxisInt, + Level, + ) from pandas import ( DataFrame, Series, diff --git a/pandas/core/ops/array_ops.py b/pandas/core/ops/array_ops.py index bc05e9a3d7c3f..f5e560e054bf7 100644 --- a/pandas/core/ops/array_ops.py +++ b/pandas/core/ops/array_ops.py @@ -7,7 +7,10 @@ import datetime from functools import partial import operator -from typing import Any +from typing import ( + Any, + TYPE_CHECKING +) import numpy as np @@ -19,10 +22,6 @@ ops as libops, ) from pandas._libs.tslibs import BaseOffset -from pandas._typing import ( - ArrayLike, - Shape, -) from pandas.core.dtypes.cast import ( construct_1d_object_array_from_listlike, @@ -56,6 +55,12 @@ from pandas.core.ops.dispatch import should_extension_dispatch from pandas.core.ops.invalid import invalid_comparison +if TYPE_CHECKING: + from pandas._typing import ( + ArrayLike, + Shape, + ) + def comp_method_OBJECT_ARRAY(op, x, y): if isinstance(y, list): diff --git a/pandas/core/ops/common.py b/pandas/core/ops/common.py index d4ae143372271..8cdd60449d5c0 100644 --- a/pandas/core/ops/common.py +++ b/pandas/core/ops/common.py @@ -5,11 +5,13 @@ from functools import wraps import sys -from typing import Callable +from typing import ( + Callable, + TYPE_CHECKING +) from pandas._libs.lib import item_from_zerodim from pandas._libs.missing import is_matching_na -from pandas._typing import F from pandas.core.dtypes.generic import ( ABCDataFrame, @@ -17,6 +19,9 @@ ABCSeries, ) +if TYPE_CHECKING: + from pandas._typing import F + def unpack_zerodim_and_defer(name: str) -> Callable[[F], F]: """ diff --git a/pandas/core/ops/dispatch.py b/pandas/core/ops/dispatch.py index 2f500703ccfb3..182603fa1a16d 100644 --- a/pandas/core/ops/dispatch.py +++ b/pandas/core/ops/dispatch.py @@ -3,12 +3,16 @@ """ from __future__ import annotations -from typing import Any - -from pandas._typing import ArrayLike +from typing import ( + Any, + TYPE_CHECKING +) from pandas.core.dtypes.generic import ABCExtensionArray +if TYPE_CHECKING: + from pandas._typing import ArrayLike + def should_extension_dispatch(left: ArrayLike, right: Any) -> bool: """ diff --git a/pandas/core/sorting.py b/pandas/core/sorting.py index 970c9998f5f5d..ebbfd35ff6b27 100644 --- a/pandas/core/sorting.py +++ b/pandas/core/sorting.py @@ -20,15 +20,6 @@ lib, ) from pandas._libs.hashtable import unique_label_indices -from pandas._typing import ( - AxisInt, - IndexKeyFunc, - Level, - NaPosition, - Shape, - SortKind, - npt, -) from pandas.core.dtypes.common import ( ensure_int64, @@ -44,6 +35,16 @@ from pandas.core.construction import extract_array if TYPE_CHECKING: + from pandas._typing import ( + AxisInt, + IndexKeyFunc, + Level, + NaPosition, + Shape, + SortKind, + npt, + ) + from pandas import MultiIndex from pandas.core.arrays import ExtensionArray from pandas.core.indexes.base import Index diff --git a/pyproject.toml b/pyproject.toml index edcf6384c432b..de9d1f41f7e9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -300,11 +300,6 @@ exclude = [ "pandas/core/series.py" = ["TCH"] "pandas/core/resample.py" = ["TCH"] "pandas/core/nanops.py" = ["TCH"] -"pandas/core/apply.py" = ["TCH"] -"pandas/core/base.py" = ["TCH"] -"pandas/core/algorithms.py" = ["TCH"] -"pandas/core/ops/*" = ["TCH"] -"pandas/core/sorting.py" = ["TCH"] "pandas/core/construction.py" = ["TCH"] "pandas/core/common.py" = ["TCH"] "pandas/core/missing.py" = ["TCH"] From 4585d39ea7ee05203406c692efcd80fe6cc348a5 Mon Sep 17 00:00:00 2001 From: ErdiTk <24619655+ErdiTk@users.noreply.github.com> Date: Wed, 8 Mar 2023 21:45:15 +0100 Subject: [PATCH 2/2] black and isort fixed after running SKIP=flake8-rst pre-commit run --all-files --- pandas/core/ops/__init__.py | 2 +- pandas/core/ops/array_ops.py | 2 +- pandas/core/ops/common.py | 2 +- pandas/core/ops/dispatch.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/core/ops/__init__.py b/pandas/core/ops/__init__.py index 074779ece23cb..615f6c6841287 100644 --- a/pandas/core/ops/__init__.py +++ b/pandas/core/ops/__init__.py @@ -14,7 +14,6 @@ import numpy as np from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op - from pandas.util._decorators import Appender from pandas.core.dtypes.common import ( @@ -76,6 +75,7 @@ AxisInt, Level, ) + from pandas import ( DataFrame, Series, diff --git a/pandas/core/ops/array_ops.py b/pandas/core/ops/array_ops.py index f5e560e054bf7..353d9505c2ec6 100644 --- a/pandas/core/ops/array_ops.py +++ b/pandas/core/ops/array_ops.py @@ -8,8 +8,8 @@ from functools import partial import operator from typing import ( + TYPE_CHECKING, Any, - TYPE_CHECKING ) import numpy as np diff --git a/pandas/core/ops/common.py b/pandas/core/ops/common.py index 8cdd60449d5c0..01fb9aa17fc48 100644 --- a/pandas/core/ops/common.py +++ b/pandas/core/ops/common.py @@ -6,8 +6,8 @@ from functools import wraps import sys from typing import ( + TYPE_CHECKING, Callable, - TYPE_CHECKING ) from pandas._libs.lib import item_from_zerodim diff --git a/pandas/core/ops/dispatch.py b/pandas/core/ops/dispatch.py index 182603fa1a16d..a939fdd3d041e 100644 --- a/pandas/core/ops/dispatch.py +++ b/pandas/core/ops/dispatch.py @@ -4,8 +4,8 @@ from __future__ import annotations from typing import ( + TYPE_CHECKING, Any, - TYPE_CHECKING ) from pandas.core.dtypes.generic import ABCExtensionArray