Skip to content

Bump isort, enable Cython package resorting - #806

Merged
rapids-bot[bot] merged 2 commits into
rapidsai:branch-21.08from
charlesbluca:bump-isort
Jun 24, 2021
Merged

rapids-bot[bot] merged 2 commits into
rapidsai:branch-21.08from
charlesbluca:bump-isort

Conversation

@charlesbluca

@charlesbluca charlesbluca commented Jun 14, 2021

Copy link
Copy Markdown
Member

With rapidsai/integration#286, the version of isort running on gpuCI will be bumped to 5.6.4, allowing us to enforce the sorting of packages in Cython (pyx, pxd) files. This PR intends to:

  • Enable these checks in the gpuCI style script
  • Enable Cython package resorting in the pre-commit hook
  • Resort all the Cython files in this repo so they pass the newly enabled checks

@charlesbluca
charlesbluca requested a review from a team as a code owner June 14, 2021 20:42
@github-actions github-actions Bot added the gpuCI label Jun 14, 2021
@jakirkham jakirkham added non-breaking Non-breaking change Python Related to RMM Python API feature request New feature or request labels Jun 14, 2021
@harrism

harrism commented Jun 24, 2021

Copy link
Copy Markdown
Member

Does this PR depend on rapidsai/integration#286 ?

@dillon-cullinan

Copy link
Copy Markdown
Contributor

Ya, should hold off on this.

@charlesbluca

Copy link
Copy Markdown
Member Author

I think it's the other way around - shouldn't we merge this in first, so that any subsequent PRs have the properly sorted Cython files that rapidsai/integration#286 enforces? See this comment

@dillon-cullinan

Copy link
Copy Markdown
Contributor

Ah, my mistake. I thought you were adding functionality that doesn't exist in the current version of isort. This is safe to merge.

@harrism

harrism commented Jun 24, 2021

Copy link
Copy Markdown
Member

Thanks for clarifying!

@harrism

harrism commented Jun 24, 2021

Copy link
Copy Markdown
Member

@gpucibot merge

@rapids-bot
rapids-bot Bot merged commit f7884b3 into rapidsai:branch-21.08 Jun 24, 2021
@charlesbluca

Copy link
Copy Markdown
Member Author

Hmm, my bad - I just noticed that there were some PXD resorts that should've been merged in this that will probably cause CI failures once rapidsai/integration#286 is merged. I will open a follow up PR that applies those changes.

@charlesbluca

charlesbluca commented Jun 24, 2021

Copy link
Copy Markdown
Member Author

Opened up #812 to address this

rapids-bot Bot pushed a commit that referenced this pull request Jun 24, 2021
I neglected to run the updated isort hooks from #806 before it was merged - this should ensure that rapidsai/integration#286 doesn't cause any CI failures here when it is merged.

Authors:
  - Charles Blackmon-Luca (https://github.com/charlesbluca)

Approvers:
  - https://github.com/jakirkham

URL: #812
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature request New feature or request gpuCI non-breaking Non-breaking change Python Related to RMM Python API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants