CI Upgrade isort in pre-commit (#36978)

* fixes issue #36879 * Fixup * sort pxd files Co-authored-by: Tom Augspurger <tom.w.augspurger@gmail.com> Co-authored-by: Marco Gorelli <m.e.gorelli@gmail.com>
pandas-dev · Oct 8, 2020 · 028eecb · 028eecb
1 parent 91e8bad
commit 028eecb
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 15 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,10 +21,12 @@ repos:
           - file
         args: [--append-config=flake8/cython-template.cfg]
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.2.2
+    rev: 5.6.0
     hooks:
     -   id: isort
         exclude: ^pandas/__init__\.py$|^pandas/core/api\.py$
+        files: '.pxd$|.py$'
+        types: [file]
 -   repo: https://github.com/asottile/pyupgrade
     rev: v2.7.2
     hooks:

diff --git a/pandas/_libs/hashtable.pxd b/pandas/_libs/hashtable.pxd
@@ -1,7 +1,15 @@
+from numpy cimport intp_t, ndarray
+
 from pandas._libs.khash cimport (
-    kh_int64_t, kh_uint64_t, kh_float64_t, kh_pymap_t, kh_str_t, uint64_t,
-    int64_t, float64_t)
-from numpy cimport ndarray, intp_t
+    float64_t,
+    int64_t,
+    kh_float64_t,
+    kh_int64_t,
+    kh_pymap_t,
+    kh_str_t,
+    kh_uint64_t,
+    uint64_t,
+)
 
 # prototypes for sharing
 

diff --git a/pandas/_libs/khash.pxd b/pandas/_libs/khash.pxd
@@ -1,5 +1,6 @@
 from cpython.object cimport PyObject
-from numpy cimport int64_t, uint64_t, int32_t, uint32_t, float64_t
+from numpy cimport float64_t, int32_t, int64_t, uint32_t, uint64_t
+
 
 cdef extern from "khash_python.h":
     ctypedef uint32_t khint_t

diff --git a/pandas/_libs/missing.pxd b/pandas/_libs/missing.pxd
@@ -1,5 +1,6 @@
 from numpy cimport ndarray, uint8_t
 
+
 cpdef bint checknull(object val)
 cpdef bint checknull_old(object val)
 cpdef ndarray[uint8_t] isnaobj(ndarray arr)

diff --git a/pandas/_libs/tslibs/ccalendar.pxd b/pandas/_libs/tslibs/ccalendar.pxd
@@ -1,6 +1,5 @@
 from cython cimport Py_ssize_t
-
-from numpy cimport int64_t, int32_t
+from numpy cimport int32_t, int64_t
 
 ctypedef (int32_t, int32_t, int32_t) iso_calendar_t
 

diff --git a/pandas/_libs/tslibs/conversion.pxd b/pandas/_libs/tslibs/conversion.pxd
@@ -1,6 +1,5 @@
 from cpython.datetime cimport datetime, tzinfo
-
-from numpy cimport int64_t, int32_t, ndarray
+from numpy cimport int32_t, int64_t, ndarray
 
 from pandas._libs.tslibs.np_datetime cimport npy_datetimestruct
 

diff --git a/pandas/_libs/tslibs/nattype.pxd b/pandas/_libs/tslibs/nattype.pxd
@@ -1,6 +1,7 @@
 from cpython.datetime cimport datetime
-
 from numpy cimport int64_t
+
+
 cdef int64_t NPY_NAT
 
 cdef bint _nat_scalar_rules[6]

diff --git a/pandas/_libs/tslibs/np_datetime.pxd b/pandas/_libs/tslibs/np_datetime.pxd
@@ -1,6 +1,6 @@
 from cpython.datetime cimport date, datetime
+from numpy cimport int32_t, int64_t
 
-from numpy cimport int64_t, int32_t
 
 cdef extern from "numpy/ndarrayobject.h":
     ctypedef int64_t npy_timedelta

diff --git a/pandas/_libs/tslibs/offsets.pxd b/pandas/_libs/tslibs/offsets.pxd
@@ -1,5 +1,6 @@
 from numpy cimport int64_t
 
+
 cpdef to_offset(object obj)
 cdef bint is_offset_object(object obj)
 cdef bint is_tick_object(object obj)

diff --git a/pandas/_libs/tslibs/period.pxd b/pandas/_libs/tslibs/period.pxd
@@ -2,5 +2,6 @@ from numpy cimport int64_t
 
 from .np_datetime cimport npy_datetimestruct
 
+
 cdef bint is_period_object(object obj)
 cdef int64_t get_period_ordinal(npy_datetimestruct *dts, int freq) nogil
diff --git a/pandas/_libs/tslibs/timedeltas.pxd b/pandas/_libs/tslibs/timedeltas.pxd
@@ -1,6 +1,7 @@
 from cpython.datetime cimport timedelta
 from numpy cimport int64_t
 
+
 # Exposed for tslib, not intended for outside use.
 cpdef int64_t delta_to_nanoseconds(delta) except? -1
 cdef convert_to_timedelta64(object ts, str unit)

diff --git a/pandas/_libs/tslibs/timestamps.pxd b/pandas/_libs/tslibs/timestamps.pxd
@@ -1,5 +1,4 @@
 from cpython.datetime cimport datetime, tzinfo
-
 from numpy cimport int64_t
 
 from pandas._libs.tslibs.base cimport ABCTimestamp

diff --git a/pandas/_libs/tslibs/timezones.pxd b/pandas/_libs/tslibs/timezones.pxd
@@ -1,5 +1,6 @@
 from cpython.datetime cimport datetime, timedelta, tzinfo
 
+
 cdef tzinfo utc_pytz
 
 cpdef bint is_utc(tzinfo tz)

diff --git a/pandas/_libs/tslibs/util.pxd b/pandas/_libs/tslibs/util.pxd
@@ -1,6 +1,7 @@
 
 from cpython.object cimport PyTypeObject
 
+
 cdef extern from *:
     """
     PyObject* char_to_string(const char* data) {
@@ -26,7 +27,8 @@ cdef extern from "Python.h":
     const char* PyUnicode_AsUTF8AndSize(object obj,
                                         Py_ssize_t* length) except NULL
 
-from numpy cimport int64_t, float64_t
+from numpy cimport float64_t, int64_t
+
 
 cdef extern from "numpy/arrayobject.h":
     PyTypeObject PyFloatingArrType_Type

diff --git a/pandas/_libs/util.pxd b/pandas/_libs/util.pxd
@@ -1,8 +1,9 @@
-from pandas._libs.tslibs.util cimport *
-
 cimport numpy as cnp
 from numpy cimport ndarray
 
+from pandas._libs.tslibs.util cimport *
+
+
 cdef extern from "numpy/ndarraytypes.h":
     void PyArray_CLEARFLAGS(ndarray arr, int flags) nogil