CI: unpin isort 5 (#35470)

Author: fangchenli

asv_bench/benchmarks/frame_ctor.py

@@ -6,7 +6,7 @@
 from .pandas_vb_common import tm
 
 try:
- from pandas.tseries.offsets import Nano, Hour
+ from pandas.tseries.offsets import Hour, Nano
 except ImportError:
  # For compatibility with older versions
  from pandas.core.datetools import * # noqa

asv_bench/benchmarks/gil.py

@@ -7,14 +7,14 @@
 
 try:
  from pandas import (
- rolling_median,
+ rolling_kurt,
+ rolling_max,
  rolling_mean,
+ rolling_median,
  rolling_min,
- rolling_max,
- rolling_var,
  rolling_skew,
- rolling_kurt,
  rolling_std,
+ rolling_var,
  )
 
  have_rolling_methods = True

asv_bench/benchmarks/io/parsers.py

@@ -2,8 +2,8 @@
 
 try:
  from pandas._libs.tslibs.parsing import (
- concat_date_cols,
  _does_string_look_like_datetime,
+ concat_date_cols,
  )
 except ImportError:
  # Avoid whole benchmark suite import failure on asv (currently 0.4)

asv_bench/benchmarks/tslibs/normalize.py

@@ -1,5 +1,5 @@
 try:
- from pandas._libs.tslibs import normalize_i8_timestamps, is_date_array_normalized
+ from pandas._libs.tslibs import is_date_array_normalized, normalize_i8_timestamps
 except ImportError:
  from pandas._libs.tslibs.conversion import (
  normalize_i8_timestamps,

ci/code_checks.sh

@@ -121,7 +121,7 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then
 
  # Imports - Check formatting using isort see setup.cfg for settings
  MSG='Check import format using isort' ; echo $MSG
- ISORT_CMD="isort --quiet --recursive --check-only pandas asv_bench scripts"
+ ISORT_CMD="isort --quiet --check-only pandas asv_bench scripts"
  if [[ "$GITHUB_ACTIONS" == "true" ]]; then
  eval $ISORT_CMD | awk '{print "##[error]" $0}'; RET=$(($RET + ${PIPESTATUS[0]}))
  else

doc/source/development/contributing.rst

@@ -751,7 +751,7 @@ Imports are alphabetically sorted within these sections.
 
 As part of :ref:`Continuous Integration <contributing.ci>` checks we run::
 
- isort --recursive --check-only pandas
+ isort --check-only pandas
 
 to check that imports are correctly formatted as per the `setup.cfg`.
 
@@ -770,8 +770,6 @@ You should run::
 
 to automatically format imports correctly. This will modify your local copy of the files.
 
-The `--recursive` flag can be passed to sort all files in a directory.
-
 Alternatively, you can run a command similar to what was suggested for ``black`` and ``flake8`` :ref:`right above <contributing.code-formatting>`::
 
  git diff upstream/master --name-only -- "*.py" | xargs -r isort

environment.yml

@@ -21,7 +21,7 @@ dependencies:
  - flake8<3.8.0 # temporary pin, GH#34150
  - flake8-comprehensions>=3.1.0 # used by flake8, linting of unnecessary comprehensions
  - flake8-rst>=0.6.0,<=0.7.0 # linting of code blocks in rst files
- - isort=4.3.21 # check that imports are in the right order
+ - isort>=5.2.1 # check that imports are in the right order
  - mypy=0.730
  - pycodestyle # used by flake8
 

pandas/_config/config.py

@@ -442,8 +442,8 @@ def register_option(
  ValueError if `validator` is specified and `defval` is not a valid value.
 
  """
- import tokenize
  import keyword
+ import tokenize
 
  key = key.lower()
 
@@ -660,8 +660,8 @@ def _build_option_description(k: str) -> str:
 
 def pp_options_list(keys: Iterable[str], width=80, _print: bool = False):
  """ Builds a concise listing of available options, grouped by prefix """
- from textwrap import wrap
  from itertools import groupby
+ from textwrap import wrap
 
  def pp(name: str, ks: Iterable[str]) -> List[str]:
  pfx = "- " + name + ".[" if name else ""

pandas/_libs/algos.pyx

@@ -1,11 +1,12 @@
 import cython
 from cython import Py_ssize_t
 
-from libc.stdlib cimport malloc, free
-from libc.string cimport memmove
 from libc.math cimport fabs, sqrt
+from libc.stdlib cimport free, malloc
+from libc.string cimport memmove
 
 import numpy as np
+
 cimport numpy as cnp
 from numpy cimport (
  NPY_FLOAT32,
@@ -31,12 +32,11 @@ from numpy cimport (
  uint32_t,
  uint64_t,
 )
+
 cnp.import_array()
 
 
 cimport pandas._libs.util as util
-from pandas._libs.util cimport numeric, get_nat
-
 from pandas._libs.khash cimport (
  kh_destroy_int64,
  kh_get_int64,
@@ -46,7 +46,7 @@ from pandas._libs.khash cimport (
  kh_resize_int64,
  khiter_t,
 )
-
+from pandas._libs.util cimport get_nat, numeric
 
 import pandas._libs.missing as missing
 

pandas/_libs/groupby.pyx

@@ -1,27 +1,51 @@
 import cython
 from cython import Py_ssize_t
-from cython cimport floating
 
-from libc.stdlib cimport malloc, free
+from cython cimport floating
+from libc.stdlib cimport free, malloc
 
 import numpy as np
+
 cimport numpy as cnp
-from numpy cimport (ndarray,
- int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t,
- uint32_t, uint64_t, float32_t, float64_t, complex64_t, complex128_t)
+from numpy cimport (
+ complex64_t,
+ complex128_t,
+ float32_t,
+ float64_t,
+ int8_t,
+ int16_t,
+ int32_t,
+ int64_t,
+ ndarray,
+ uint8_t,
+ uint16_t,
+ uint32_t,
+ uint64_t,
+)
 from numpy.math cimport NAN
-cnp.import_array()
 
-from pandas._libs.util cimport numeric, get_nat
+cnp.import_array()
 
-from pandas._libs.algos cimport (swap, TiebreakEnumType, TIEBREAK_AVERAGE,
- TIEBREAK_MIN, TIEBREAK_MAX, TIEBREAK_FIRST,
- TIEBREAK_DENSE)
-from pandas._libs.algos import (take_2d_axis1_float64_float64,
- groupsort_indexer, tiebreakers)
+from pandas._libs.algos cimport (
+ TIEBREAK_AVERAGE,
+ TIEBREAK_DENSE,
+ TIEBREAK_FIRST,
+ TIEBREAK_MAX,
+ TIEBREAK_MIN,
+ TiebreakEnumType,
+ swap,
+)
+from pandas._libs.util cimport get_nat, numeric
+
+from pandas._libs.algos import (
+ groupsort_indexer,
+ take_2d_axis1_float64_float64,
+ tiebreakers,
+)
 
 from pandas._libs.missing cimport checknull
 
+
 cdef int64_t NPY_NAT = get_nat()
 _int64_max = np.iinfo(np.int64).max