Skip to content

Commit

Permalink
Merge pull request #11444 from rapidsai/branch-22.08
Browse files Browse the repository at this point in the history
  • Loading branch information
raydouglass committed Aug 17, 2022
2 parents 0dab0f8 + 6ca81bb commit a7f8de5
Show file tree
Hide file tree
Showing 840 changed files with 34,827 additions and 15,694 deletions.
2 changes: 0 additions & 2 deletions .dockerignore

This file was deleted.

3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ java/ @rapidsai/cudf-java-codeowners
.github/ @rapidsai/ops-codeowners
/ci/ @rapidsai/ops-codeowners
conda/ @rapidsai/ops-codeowners
/Dockerfile @rapidsai/ops-codeowners
/.dockerignore @rapidsai/ops-codeowners
/docker/ @rapidsai/ops-codeowners
65 changes: 9 additions & 56 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,56 +1,9 @@
<!--
Thank you for contributing to cuDF :)
Here are some guidelines to help the review process go smoothly.
1. Please write a description in this text box of the changes that are being
made.
2. Please ensure that you have written units tests for the changes made/features
added.
3. There are CI checks in place to enforce that committed code follows our style
and syntax standards. Please see our contribution guide in `CONTRIBUTING.MD`
in the project root for more information about the checks we perform and how
you can run them locally.
4. If you are closing an issue please use one of the automatic closing words as
noted here: https://help.github.com/articles/closing-issues-using-keywords/
5. If your pull request is not ready for review but you want to make use of the
continuous integration testing facilities please mark your pull request as Draft.
https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request#converting-a-pull-request-to-a-draft
6. If your pull request is ready to be reviewed without requiring additional
work on top of it, then remove it from "Draft" and make it "Ready for Review".
https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review
If assistance is required to complete the functionality, for example when the
C/C++ code of a feature is complete but Python bindings are still required,
then add the label `help wanted` so that others can triage and assist.
The additional changes then can be implemented on top of the same PR.
If the assistance is done by members of the rapidsAI team, then no
additional actions are required by the creator of the original PR for this,
otherwise the original author of the PR needs to give permission to the
person(s) assisting to commit to their personal fork of the project. If that
doesn't happen then a new PR based on the code of the original PR can be
opened by the person assisting, which then will be the PR that will be
merged.
7. Once all work has been done and review has taken place please do not add
features or make changes out of the scope of those requested by the reviewer
(doing this just add delays as already reviewed code ends up having to be
re-reviewed/it is hard to tell what is new etc!). Further, please do not
rebase your branch on the target branch, force push, or rewrite history.
Doing any of these causes the context of any comments made by reviewers to be lost.
If conflicts occur against the target branch they should be resolved by
merging the target branch into the branch used for making the pull request.
8. Pull requests that modify cpp source that are marked ready for review
will automatically be assigned two cudf-cpp-codeowners reviewers.
Ensure at least two approvals from cudf-cpp-codeowners before merging.
Many thanks in advance for your cooperation!
-->
## Description
<!-- Provide a standalone description of changes in this PR. -->
<!-- Reference any issues closed by this PR with "closes #1234". -->
<!-- Note: The pull request title will be included in the CHANGELOG. -->

## Checklist
- [ ] I am familiar with the [Contributing Guidelines](https://github.com/rapidsai/cudf/blob/HEAD/CONTRIBUTING.md).
- [ ] New or existing tests cover these changes.
- [ ] The documentation is up to date with these changes.
2 changes: 2 additions & 0 deletions .github/ops-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ branch_checker: true
label_checker: true
release_drafter: true
external_contributors: false
copy_prs: true
rerun_tests: true
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ parts/
sdist/
var/
wheels/
_skbuild/
*.egg-info/
.installed.cfg
*.egg
Expand Down Expand Up @@ -162,4 +163,4 @@ dask-worker-space/

# Sphinx docs & build artifacts
docs/cudf/source/api_docs/generated/*
docs/cudf/source/api_docs/api/*
docs/cudf/source/api_docs/api/*
71 changes: 27 additions & 44 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,40 @@

repos:
- repo: https://github.com/PyCQA/isort
rev: 5.6.4
rev: 5.10.1
hooks:
- id: isort
alias: isort-cudf
name: isort-cudf
args: ["--settings-path=python/cudf/setup.cfg"]
files: python/cudf/.*
exclude: __init__.py$
types: [text]
# Use the config file specific to each subproject so that each
# project can specify its own first/third-party packages.
args: ["--config-root=python/", "--resolve-all-configs"]
files: python/.*
exclude: (__init__.py|setup.py)$
types_or: [python, cython, pyi]
- id: isort
alias: isort-cudf-kafka
name: isort-cudf-kafka
args: ["--settings-path=python/cudf_kafka/setup.cfg"]
files: python/cudf_kafka/.*
types: [text]
types_or: [python, cython]
- 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/psf/black
rev: 22.3.0
hooks:
- id: black
files: python/.*
# Explicitly specify the pyproject.toml at the repo root, not per-project.
args: ["--config", "pyproject.toml"]
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
alias: flake8
name: flake8
args: ["--config=python/.flake8"]
files: python/.*\.py$
- id: flake8
alias: flake8-cython
name: flake8-cython
args: ["--config=python/.flake8.cython"]
types: [cython]
args: ["--config=setup.cfg"]
files: python/.*\.(py|pyx|pxd)$
types: [file]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v0.782'
hooks:
- id: mypy
args: ["--config-file=python/cudf/setup.cfg", "python/cudf/cudf"]
args: ["--config-file=setup.cfg", "python/cudf/cudf", "python/dask_cudf/dask_cudf", "python/custreamz/custreamz", "python/cudf_kafka/cudf_kafka"]
pass_filenames: false
- repo: https://github.com/PyCQA/pydocstyle
rev: 6.1.1
hooks:
- id: pydocstyle
args: ["--config=python/.flake8"]
exclude: |
(?x)^(
ci|
cpp|
conda|
docs|
java|
notebooks
)
args: ["--config=setup.cfg"]
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v11.1.0
hooks:
Expand All @@ -76,6 +45,12 @@ repos:
args: ['-fallback-style=none', '-style=file', '-i']
- repo: local
hooks:
- id: no-deprecationwarning
name: no-deprecationwarning
description: 'Enforce that DeprecationWarning is not introduced (use FutureWarning instead)'
entry: '(category=|\s)DeprecationWarning[,)]'
language: pygrep
types_or: [python, cython]
- id: cmake-format
name: cmake-format
entry: ./cpp/scripts/run-cmake-format.sh cmake-format
Expand All @@ -101,6 +76,14 @@ repos:
stages: [commit]
entry: python ./ci/checks/copyright.py --git-modified-only
language: python
- id: doxygen-check
name: doxygen-check
entry: ./ci/checks/doxygen.sh
files: ^cpp/include/
types_or: [file]
language: system
pass_filenames: false
verbose: true

default_language_version:
python: python3
Loading

0 comments on commit a7f8de5

Please sign in to comment.