Skip to content

Commit 75410f8

Browse files
SaturnFromTitanjreback
authored andcommitted
CLN: Consistent imports - linting rules (#29318)
1 parent 3c0cf22 commit 75410f8

File tree

10 files changed

+19
-12
lines changed

10 files changed

+19
-12
lines changed

ci/code_checks.sh

+9-3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,15 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
120120
# Check for imports from pandas.core.common instead of `import pandas.core.common as com`
121121
# Check for imports from collections.abc instead of `from collections import abc`
122122
MSG='Check for non-standard imports' ; echo $MSG
123-
invgrep -R --include="*.py*" -E "from pandas.core.common import " pandas
124-
invgrep -R --include="*.py*" -E "from collections.abc import " pandas
125-
invgrep -R --include="*.py*" -E "from numpy import nan " pandas
123+
invgrep -R --include="*.py*" -E "from pandas.core.common import" pandas
124+
invgrep -R --include="*.py*" -E "from pandas.core import common" pandas
125+
invgrep -R --include="*.py*" -E "from collections.abc import" pandas
126+
invgrep -R --include="*.py*" -E "from numpy import nan" pandas
127+
128+
# Checks for test suite
129+
# Check for imports from pandas.util.testing instead of `import pandas.util.testing as tm`
130+
invgrep -R --include="*.py*" -E "from pandas.util.testing import" pandas/tests
131+
invgrep -R --include="*.py*" -E "from pandas.util import testing as tm" pandas/tests
126132
RET=$(($RET + $?)) ; echo $MSG "DONE"
127133

128134
MSG='Check for use of exec' ; echo $MSG

pandas/core/algorithms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
from pandas.core.dtypes.generic import ABCIndex, ABCIndexClass, ABCSeries
4747
from pandas.core.dtypes.missing import isna, na_value_for_dtype
4848

49-
from pandas.core import common as com
49+
import pandas.core.common as com
5050
from pandas.core.construction import array, extract_array
5151
from pandas.core.indexers import validate_indices
5252

pandas/core/computation/expr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import numpy as np
1313

1414
import pandas as pd
15-
from pandas.core import common as com
15+
import pandas.core.common as com
1616
from pandas.core.computation.common import (
1717
_BACKTICK_QUOTED_STRING,
1818
_remove_spaces_column_name,

pandas/core/indexes/period.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
pandas_dtype,
2121
)
2222

23-
from pandas.core import common as com
2423
from pandas.core.accessor import delegate_names
2524
from pandas.core.algorithms import unique1d
2625
from pandas.core.arrays.period import PeriodArray, period_array, validate_dtype_freq
2726
from pandas.core.base import _shared_docs
27+
import pandas.core.common as com
2828
import pandas.core.indexes.base as ibase
2929
from pandas.core.indexes.base import _index_shared_docs, ensure_index
3030
from pandas.core.indexes.datetimelike import (

pandas/core/reshape/concat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import numpy as np
88

99
from pandas import DataFrame, Index, MultiIndex, Series
10-
from pandas.core import common as com
1110
from pandas.core.arrays.categorical import (
1211
_factorize_from_iterable,
1312
_factorize_from_iterables,
1413
)
14+
import pandas.core.common as com
1515
from pandas.core.generic import NDFrame
1616
from pandas.core.index import (
1717
_all_indexes_same,

pandas/core/reshape/util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from pandas.core.dtypes.common import is_list_like
44

5-
from pandas.core import common as com
5+
import pandas.core.common as com
66

77

88
def cartesian_product(X):

pandas/tests/indexing/multiindex/test_chaining_and_caching.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import pytest
33

44
from pandas import DataFrame, MultiIndex, Series
5-
from pandas.core import common as com
5+
import pandas.core.common as com
66
import pandas.util.testing as tm
77

88

pandas/tests/indexing/test_chaining_and_caching.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import pandas as pd
55
from pandas import DataFrame, Series, Timestamp, date_range, option_context
6-
from pandas.core import common as com
6+
import pandas.core.common as com
77
import pandas.util.testing as tm
88

99

pandas/tests/test_common.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import pandas as pd
1010
from pandas import Series, Timestamp
11-
from pandas.core import common as com, ops
11+
from pandas.core import ops
12+
import pandas.core.common as com
1213

1314

1415
def test_get_callable_name():

pandas/tests/test_sorting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77

88
from pandas import DataFrame, MultiIndex, Series, array, concat, merge
9-
from pandas.core import common as com
9+
import pandas.core.common as com
1010
from pandas.core.sorting import (
1111
decons_group_index,
1212
get_group_index,

0 commit comments

Comments
 (0)