From cd77a0bbf8a6c3800fbe6bc895dc7f58ee763324 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 21 Oct 2021 13:59:39 -0500 Subject: [PATCH 1/3] Add back pinnings for style checks. --- conda/environments/cudf_dev_cuda11.0.yml | 4 ++++ conda/environments/cudf_dev_cuda11.2.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index ba98733cc58..7cb70922a39 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -34,6 +34,10 @@ dependencies: - pandoc=<2.0.0 - cudatoolkit=11.0 - pip + - flake8=3.8.3 + - black=19.10 + - isort=5.6.4 + - mypy=0.782 - 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 index 4bb56cefdda..ec720a8e781 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -34,6 +34,10 @@ dependencies: - pandoc=<2.0.0 - cudatoolkit=11.2 - pip + - flake8=3.8.3 + - black=19.10 + - isort=5.6.4 + - mypy=0.782 - typing_extensions - pre-commit - dask>=2021.09.1 From 959caa520010037d700d7ce8c14dd422446791ac Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 21 Oct 2021 14:09:44 -0500 Subject: [PATCH 2/3] Revert pre-commit pinnings to match conda environment. --- .pre-commit-config.yaml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a7c5cc847fe..908da3787f2 100644 --- 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 From d9a190be8ee30b2c3d4576a719db366b14bbbb22 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 21 Oct 2021 14:10:25 -0500 Subject: [PATCH 3/3] Add pydocstyle pinning to the conda environment. --- conda/environments/cudf_dev_cuda11.0.yml | 1 + conda/environments/cudf_dev_cuda11.2.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 7cb70922a39..9d6daef7a2f 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -38,6 +38,7 @@ dependencies: - 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 index ec720a8e781..986effae1a6 100644 --- a/conda/environments/cudf_dev_cuda11.2.yml +++ b/conda/environments/cudf_dev_cuda11.2.yml @@ -38,6 +38,7 @@ dependencies: - black=19.10 - isort=5.6.4 - mypy=0.782 + - pydocstyle=6.1.1 - typing_extensions - pre-commit - dask>=2021.09.1