Make gpuCI and pre-commit style configurations consistent

.pre-commit-config.yaml

@@ -3,21 +3,38 @@ repos:
         rev: 5.0.7
         hooks:
               - id: isort
+                alias: isort-cudf
+                name: isort-cudf
+                args: ["--settings-path=python/cudf/setup.cfg"]
+                files: python/cudf/.*
+              - id: isort
+                alias: isort-cudf-kafka
+                name: isort-cudf-kafka
+                args: ["--settings-path=python/cudf_kafka/setup.cfg"]
+                files: python/cudf_kafka/.*
+              - id: isort
+                alias: isort-custreamz
+                name: isort-custreamz
+                args: ["--settings-path=python/custreamz/setup.cfg"]
+                files: python/custreamz/.*
+              - id: isort
+                alias: isort-dask-cudf
+                name: isort-dask-cudf
+                args: ["--settings-path=python/dask_cudf/setup.cfg"]
+                files: python/dask_cudf/.*
       - repo: https://github.com/ambv/black
         rev: 19.10b0
         hooks:
               - id: black
+                files: python/.*
       - repo: https://gitlab.com/pycqa/flake8
         rev: 3.8.3
         hooks:
               - id: flake8
                 alias: flake8
                 name: flake8
                 args: ["--config=python/.flake8"]
-                types: [python]
-      - repo: https://gitlab.com/pycqa/flake8
-        rev: 3.8.3
-        hooks:
+                files: python/.*\.py$
               - id: flake8
                 alias: flake8-cython
                 name: flake8-cython

ci/checks/style.sh

@@ -13,41 +13,77 @@ LANG=C.UTF-8
 # Activate common conda env
 source activate gdf
 
-# Run isort and get results/return code
-ISORT=`isort --check-only python/**/*.py`
-ISORT_RETVAL=$?
+# Run isort-cudf and get results/return code
+ISORT_CUDF=`isort python/cudf --check-only --settings-path=python/cudf/setup.cfg --skip-glob *.pyx --skip-glob *.pyi 2>&1`
+ISORT_CUDF_RETVAL=$?
+
+# Run isort-cudf-kafka and get results/return code
+ISORT_CUDF_KAFKA=`isort python/cudf_kafka --check-only --settings-path=python/cudf_kafka/setup.cfg --skip-glob *.pyx --skip-glob *.pyi 2>&1`
+ISORT_CUDF_KAFKA_RETVAL=$?
+
+# Run isort-custreamz and get results/return code
+ISORT_CUSTREAMZ=`isort python/custreamz --check-only --settings-path=python/custreamz/setup.cfg --skip-glob *.pyx --skip-glob *.pyi 2>&1`
+ISORT_CUSTREAMZ_RETVAL=$?
+
+# Run isort-dask-cudf and get results/return code
+ISORT_DASK_CUDF=`isort python/dask_cudf --check-only --settings-path=python/dask_cudf/setup.cfg --skip-glob *.pyx --skip-glob *.pyi 2>&1`
+ISORT_DASK_CUDF_RETVAL=$?
 
 # Run black and get results/return code
-BLACK=`black --check python`
+BLACK=`black --check python 2>&1`
 BLACK_RETVAL=$?
 
 # Run flake8 and get results/return code
-FLAKE=`flake8 --config=python/.flake8 python`
+FLAKE=`flake8 --config=python/.flake8 python 2>&1`
 FLAKE_RETVAL=$?
 
 # Run flake8-cython and get results/return code
-FLAKE_CYTHON=`flake8 --config=python/.flake8.cython`
+FLAKE_CYTHON=`flake8 --config=python/.flake8.cython 2>&1`
 FLAKE_CYTHON_RETVAL=$?
 
 # Run mypy and get results/return code
-MYPY_CUDF=`mypy --config=python/cudf/setup.cfg python/cudf/cudf`
+MYPY_CUDF=`mypy --config=python/cudf/setup.cfg python/cudf/cudf 2>&1`
 MYPY_CUDF_RETVAL=$?
 
 # Run pydocstyle and get results/return code
-PYDOCSTYLE=`pydocstyle --config=python/.flake8 python`
+PYDOCSTYLE=`pydocstyle --config=python/.flake8 python 2>&1`
 PYDOCSTYLE_RETVAL=$?
 
 # Run clang-format and check for a consistent code format
 CLANG_FORMAT=`python cpp/scripts/run-clang-format.py 2>&1`
 CLANG_FORMAT_RETVAL=$?
 
 # Output results if failure otherwise show pass
-if [ "$ISORT_RETVAL" != "0" ]; then
-  echo -e "\n\n>>>> FAILED: isort style check; begin output\n\n"
-  echo -e "$ISORT"
-  echo -e "\n\n>>>> FAILED: isort style check; end output\n\n"
+if [ "$ISORT_CUDF_RETVAL" != "0" ]; then
+  echo -e "\n\n>>>> FAILED: isort-cudf style check; begin output\n\n"
+  echo -e "$ISORT_CUDF"
+  echo -e "\n\n>>>> FAILED: isort-cudf style check; end output\n\n"
+else
+  echo -e "\n\n>>>> PASSED: isort-cudf style check\n\n"
+fi
+
+if [ "$ISORT_CUDF_KAFKA_RETVAL" != "0" ]; then
+  echo -e "\n\n>>>> FAILED: isort-cudf-kafka style check; begin output\n\n"
+  echo -e "$ISORT_CUDF_KAFKA"
+  echo -e "\n\n>>>> FAILED: isort-cudf-kafka style check; end output\n\n"
+else
+  echo -e "\n\n>>>> PASSED: isort-cudf-kafka style check\n\n"
+fi
+
+if [ "$ISORT_CUSTREAMZ_RETVAL" != "0" ]; then
+  echo -e "\n\n>>>> FAILED: isort-custreamz style check; begin output\n\n"
+  echo -e "$ISORT_CUSTREAMZ"
+  echo -e "\n\n>>>> FAILED: isort-custreamz style check; end output\n\n"
+else
+  echo -e "\n\n>>>> PASSED: isort-custreamz style check\n\n"
+fi
+
+if [ "$ISORT_DASK_CUDF_RETVAL" != "0" ]; then
+  echo -e "\n\n>>>> FAILED: isort-dask-cudf style check; begin output\n\n"
+  echo -e "$ISORT_DASK_CUDF"
+  echo -e "\n\n>>>> FAILED: isort-dask-cudf style check; end output\n\n"
 else
-  echo -e "\n\n>>>> PASSED: isort style check\n\n"
+  echo -e "\n\n>>>> PASSED: isort-dask-cudf style check\n\n"
 fi
 
 if [ "$BLACK_RETVAL" != "0" ]; then

cpp/scripts/run-clang-format.py

@@ -29,10 +29,10 @@
 DEFAULT_DIRS = [
     "cpp/benchmarks",
     "cpp/include",
-    "cpp/include/cudf",
-    "cpp/include/nvtext",
+    "cpp/libcudf_kafka",
     "cpp/src",
     "cpp/tests",
+    "java/src/main/native",
 ]