From c77aafc2b8008f30b5c8fdb9805ed3bbf6b7fb4e Mon Sep 17 00:00:00 2001 From: Martin Winkel Date: Fri, 1 Nov 2019 09:18:45 +0100 Subject: [PATCH 1/2] updated import linting rules --- ci/code_checks.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/code_checks.sh b/ci/code_checks.sh index f704a1018c926..07c99b39e83e8 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -120,9 +120,15 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then # Check for imports from pandas.core.common instead of `import pandas.core.common as com` # Check for imports from collections.abc instead of `from collections import abc` MSG='Check for non-standard imports' ; echo $MSG - invgrep -R --include="*.py*" -E "from pandas.core.common import " pandas - invgrep -R --include="*.py*" -E "from collections.abc import " pandas - invgrep -R --include="*.py*" -E "from numpy import nan " pandas + invgrep -R --include="*.py*" -E "from pandas.core.common import" pandas + invgrep -R --include="*.py*" -E "from pandas.core import common" pandas + invgrep -R --include="*.py*" -E "from collections.abc import" pandas + invgrep -R --include="*.py*" -E "from numpy import nan" pandas + + # Checks for test suite + # Check for imports from pandas.util.testing instead of `import pandas.util.testing as tm` + invgrep -R --include="*.py*" -E "from pandas.util.testing import" pandas/tests + invgrep -R --include="*.py*" -E "from pandas.util import testing as tm" pandas/tests RET=$(($RET + $?)) ; echo $MSG "DONE" MSG='Check for use of exec' ; echo $MSG From cc673f734133484c5392556e5554c76b290d4259 Mon Sep 17 00:00:00 2001 From: Martin Winkel Date: Fri, 1 Nov 2019 09:19:30 +0100 Subject: [PATCH 2/2] fixed imports for pandas.core.common --- pandas/core/algorithms.py | 2 +- pandas/core/computation/expr.py | 2 +- pandas/core/indexes/period.py | 2 +- pandas/core/reshape/concat.py | 2 +- pandas/core/reshape/util.py | 2 +- pandas/tests/indexing/multiindex/test_chaining_and_caching.py | 2 +- pandas/tests/indexing/test_chaining_and_caching.py | 2 +- pandas/tests/test_common.py | 3 ++- pandas/tests/test_sorting.py | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index 98a090ef26f2a..c70e623778315 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -46,7 +46,7 @@ from pandas.core.dtypes.generic import ABCIndex, ABCIndexClass, ABCSeries from pandas.core.dtypes.missing import isna, na_value_for_dtype -from pandas.core import common as com +import pandas.core.common as com from pandas.core.construction import array, extract_array from pandas.core.indexers import validate_indices diff --git a/pandas/core/computation/expr.py b/pandas/core/computation/expr.py index 45319a4d63d94..72367c8fb7a4f 100644 --- a/pandas/core/computation/expr.py +++ b/pandas/core/computation/expr.py @@ -12,7 +12,7 @@ import numpy as np import pandas as pd -from pandas.core import common as com +import pandas.core.common as com from pandas.core.computation.common import ( _BACKTICK_QUOTED_STRING, _remove_spaces_column_name, diff --git a/pandas/core/indexes/period.py b/pandas/core/indexes/period.py index a20290e77023a..a0f16789621c7 100644 --- a/pandas/core/indexes/period.py +++ b/pandas/core/indexes/period.py @@ -20,11 +20,11 @@ pandas_dtype, ) -from pandas.core import common as com from pandas.core.accessor import delegate_names from pandas.core.algorithms import unique1d from pandas.core.arrays.period import PeriodArray, period_array, validate_dtype_freq from pandas.core.base import _shared_docs +import pandas.core.common as com import pandas.core.indexes.base as ibase from pandas.core.indexes.base import _index_shared_docs, ensure_index from pandas.core.indexes.datetimelike import ( diff --git a/pandas/core/reshape/concat.py b/pandas/core/reshape/concat.py index 60bab817705e3..bbf41fc28e9d2 100644 --- a/pandas/core/reshape/concat.py +++ b/pandas/core/reshape/concat.py @@ -7,11 +7,11 @@ import numpy as np from pandas import DataFrame, Index, MultiIndex, Series -from pandas.core import common as com from pandas.core.arrays.categorical import ( _factorize_from_iterable, _factorize_from_iterables, ) +import pandas.core.common as com from pandas.core.generic import NDFrame from pandas.core.index import ( _all_indexes_same, diff --git a/pandas/core/reshape/util.py b/pandas/core/reshape/util.py index 044e058904dce..d8652c9b4fac9 100644 --- a/pandas/core/reshape/util.py +++ b/pandas/core/reshape/util.py @@ -2,7 +2,7 @@ from pandas.core.dtypes.common import is_list_like -from pandas.core import common as com +import pandas.core.common as com def cartesian_product(X): diff --git a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py index 3183721eeb54f..e0206c8e7f6aa 100644 --- a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py +++ b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py @@ -2,7 +2,7 @@ import pytest from pandas import DataFrame, MultiIndex, Series -from pandas.core import common as com +import pandas.core.common as com import pandas.util.testing as tm diff --git a/pandas/tests/indexing/test_chaining_and_caching.py b/pandas/tests/indexing/test_chaining_and_caching.py index bd106ba9c36f1..274b72b0561a9 100644 --- a/pandas/tests/indexing/test_chaining_and_caching.py +++ b/pandas/tests/indexing/test_chaining_and_caching.py @@ -3,7 +3,7 @@ import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range, option_context -from pandas.core import common as com +import pandas.core.common as com import pandas.util.testing as tm diff --git a/pandas/tests/test_common.py b/pandas/tests/test_common.py index 65b2dab1b02a8..a8a0fcea7182c 100644 --- a/pandas/tests/test_common.py +++ b/pandas/tests/test_common.py @@ -8,7 +8,8 @@ import pandas as pd from pandas import Series, Timestamp -from pandas.core import common as com, ops +from pandas.core import ops +import pandas.core.common as com def test_get_callable_name(): diff --git a/pandas/tests/test_sorting.py b/pandas/tests/test_sorting.py index 32aeb7b186827..b86aaa0ed7e1f 100644 --- a/pandas/tests/test_sorting.py +++ b/pandas/tests/test_sorting.py @@ -6,7 +6,7 @@ import pytest from pandas import DataFrame, MultiIndex, Series, array, concat, merge -from pandas.core import common as com +import pandas.core.common as com from pandas.core.sorting import ( decons_group_index, get_group_index,