-
Notifications
You must be signed in to change notification settings - Fork 31
Fix forward merge of release/25.12 into main #359
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.
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
Open
alexbarghi-nv
wants to merge
2
commits into
rapidsai:main
Choose a base branch
from
alexbarghi-nv:main-merge-release/25.12
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix forward merge of release/25.12 into main #359
alexbarghi-nv
wants to merge
2
commits into
rapidsai:main
from
alexbarghi-nv:main-merge-release/25.12
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pin to workaround for issues: * rapidsai/build-planning#229 * rapidsai/build-planning#230 ## Description Recently Cython 3.2.0 was released and we have seen a few subtle issues building with it. While we work out these issues, this pins to Cython 3.1, which know to be working for us. Similarly PyTest 9 was recently released, but we have ran into some issues with it as well. So pin to PyTest 8 while we work through PyTest 9 issues. --------- Co-authored-by: Alex Barghi <[email protected]> Co-authored-by: Gil Forsyth <[email protected]>
Contributor
Greptile OverviewGreptile SummaryThis PR completes the forward merge of release/25.12 into main by applying dependency version pins for Cython (<3.2.0a0) and pytest (<9.0.0a0).
Confidence Score: 5/5
Important Files ChangedFile Analysis
Sequence DiagramsequenceDiagram
participant Dev as Developer
participant Merge as Forward Merge Process
participant DepFile as dependencies.yaml
participant Generator as rapids-dependency-file-generator
participant CondaEnvs as Conda Environment Files
participant PyProj as PyProject.toml Files
participant Recipe as Conda Recipe Files
Dev->>Merge: Initiate forward merge from release/25.12
Merge->>DepFile: Apply Cython pin (<3.2.0a0)
Merge->>DepFile: Apply pytest pin (<9.0.0a0)
Note over DepFile: Source of truth for all dependencies
DepFile->>Generator: Trigger dependency file generation
Generator->>CondaEnvs: Update 4 all_cuda environment files
Note over CondaEnvs: Update Cython and pytest pins<br/>Maintain alphabetical ordering
Generator->>PyProj: Update cugraph-pyg/pyproject.toml
Generator->>PyProj: Update pylibwholegraph/pyproject.toml
Note over PyProj: Move pytest to maintain ordering<br/>Add Cython pin where needed
Generator->>Recipe: Update pylibwholegraph/recipe.yaml
Note over Recipe: Add Cython build requirement pin
Merge->>Dev: All 12 files updated consistently
|
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
12 files reviewed, no comments
bdice
approved these changes
Nov 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the forward merge.