Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump isort, enable Cython package resorting #419

Merged
merged 8 commits into from
Jul 6, 2021
Merged

Bump isort, enable Cython package resorting #419

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0ebd18
Bump isort, enable cython resorting
charlesbluca Jun 14, 2021
3ba4608
Switch to pycqa repo
charlesbluca Jun 14, 2021
4f75b1f
Merge remote-tracking branch 'upstream/branch-21.08' into bump-isort
charlesbluca Jun 21, 2021
98bc14b
Run isort hooks
charlesbluca Jun 21, 2021
fbc0cdc
Pin Black version to match gpuCI
charlesbluca Jun 21, 2021
8b01c04
Add filters for flake8 and black hooks
charlesbluca Jun 30, 2021
5adff63
Rerun hooks
charlesbluca Jul 2, 2021
2bcc918
Merge remote-tracking branch 'upstream/branch-21.08' into bump-isort
charlesbluca Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
repos:
- repo: https://github.com/timothycrosley/isort
rev: 5.0.4
- repo: https://github.com/pycqa/isort
rev: 5.6.4
hooks:
- id: isort
args: ["--settings-path=python/cuspatial/setup.cfg"]
files: python/cuspatial/.*
exclude: __init__.py$
types: [text]
types_or: [python, cython]
- repo: https://github.com/ambv/black
rev: stable
hooks:
Expand Down
2 changes: 1 addition & 1 deletion ci/checks/style.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LANG=C.UTF-8
conda activate rapids

# Run isort and get results/return code
ISORT=`isort --check-only python/**/*.py`
ISORT=`isort --check-only python/cuspatial --settings-path=python/cuspatial/setup.cfg`
ISORT_RETVAL=$?

# Run black and get results/return code
Expand Down