From 725101c396f2d2c9ade3182991348f3acef52e77 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 14 Jun 2021 16:40:46 -0400
Subject: [PATCH 1/2] Bump isort, enable Cython package resorting

---
 .pre-commit-config.yaml | 9 +++++++--
 ci/checks/style.sh      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 910865fd2..2323a247a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,8 +1,13 @@
 repos:
-    - repo: https://github.com/timothycrosley/isort
-      rev: 5.0.7
+    - repo: https://github.com/pycqa/isort
+      rev: 5.6.4
       hooks:
           - id: isort
+            args: ["--settings-path=python/setup.cfg"]
+            files: python/.*
+            exclude: __init__.py$
+            types: [text]
+            types_or: [python, cython]
     - repo: https://github.com/ambv/black
       rev: 19.10b0
       hooks:
diff --git a/ci/checks/style.sh b/ci/checks/style.sh
index 754c6ccfc..88115cee5 100644
--- a/ci/checks/style.sh
+++ b/ci/checks/style.sh
@@ -15,7 +15,7 @@ LANG=C.UTF-8
 conda activate rapids
 
 # Run isort and get results/return code
-ISORT=`isort --recursive --check-only python`
+ISORT=`isort --check-only python`
 ISORT_RETVAL=$?
 
 # Run black and get results/return code

From e157815b45e0650ff10512c7e30fa55901741965 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 14 Jun 2021 17:13:40 -0400
Subject: [PATCH 2/2] Add settings path arg to gpuCI check

---
 ci/checks/style.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/checks/style.sh b/ci/checks/style.sh
index 88115cee5..a064681ac 100644
--- a/ci/checks/style.sh
+++ b/ci/checks/style.sh
@@ -15,7 +15,7 @@ LANG=C.UTF-8
 conda activate rapids
 
 # Run isort and get results/return code
-ISORT=`isort --check-only python`
+ISORT=`isort --check-only python --settings-path=python/setup.cfg `
 ISORT_RETVAL=$?
 
 # Run black and get results/return code