Match conda pinnings for style checks (revert part of #9412, #9433). (#…

…9490) Some changes in #9412 and #9433 may lead to conflicts in VSCode / rapids-compose behavior for many developers. I am closing my PRs #9448 and #9450 for the same reason. See #9450 (comment) for details. This PR reverts the problematic parts of #9412 and #9433, and makes the pre-commit configuration and the conda environment pinnings consistent. Tagging @vyasr @galipremsagar @ajschmidt8 for awareness. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Vyas Ramasubramani (https://github.com/vyasr) URL: #9490
rapidsai · Oct 21, 2021 · 5d67946 · 5d67946
1 parent 23de7d0
commit 5d67946
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
       - repo: https://github.com/PyCQA/isort
-        rev: 5.9.3
+        rev: 5.6.4
         hooks:
               - id: isort
                 alias: isort-cudf
@@ -33,7 +33,7 @@ repos:
               - id: black
                 files: python/.*
       - repo: https://github.com/PyCQA/flake8
-        rev: 4.0.1
+        rev: 3.8.3
         hooks:
               - id: flake8
                 alias: flake8
@@ -45,6 +45,17 @@ repos:
                 name: flake8-cython
                 args: ["--config=python/.flake8.cython"]
                 types: [cython]
+      - repo: https://github.com/pre-commit/mirrors-mypy
+        rev: 'v0.782'
+        hooks:
+              - id: mypy
+                args: ["--config-file=python/cudf/setup.cfg", "python/cudf/cudf"]
+                pass_filenames: false
+      - repo: https://github.com/PyCQA/pydocstyle
+        rev: 6.1.1
+        hooks:
+              - id: pydocstyle
+                args: ["--config=python/.flake8"]
       - repo: local
         hooks:
               - id: clang-format
@@ -59,18 +70,6 @@ repos:
                 language: system
                 files: \.(cu|cuh|h|hpp|cpp|inl)$
                 args: ['-fallback-style=none']
-      - repo: https://github.com/pre-commit/mirrors-mypy
-        rev: 'v0.782'
-        hooks:
-              - id: mypy
-                args: ["--config-file=python/cudf/setup.cfg", "python/cudf/cudf"]
-                pass_filenames: false
-      - repo: https://github.com/PyCQA/pydocstyle
-        rev: 6.1.1
-        hooks:
-              - id: pydocstyle
-                args: ["--config=python/.flake8"]
-
 
 default_language_version:
       python: python3
diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml
@@ -34,6 +34,11 @@ dependencies:
   - pandoc=<2.0.0
   - cudatoolkit=11.0
   - pip
+  - flake8=3.8.3
+  - black=19.10
+  - isort=5.6.4
+  - mypy=0.782
+  - pydocstyle=6.1.1
   - typing_extensions
   - pre-commit
   - dask>=2021.09.1

diff --git a/conda/environments/cudf_dev_cuda11.2.yml b/conda/environments/cudf_dev_cuda11.2.yml
@@ -34,6 +34,11 @@ dependencies:
   - pandoc=<2.0.0
   - cudatoolkit=11.2
   - pip
+  - flake8=3.8.3
+  - black=19.10
+  - isort=5.6.4
+  - mypy=0.782
+  - pydocstyle=6.1.1
   - typing_extensions
   - pre-commit
   - dask>=2021.09.1