Skip to content

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.

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

Merged
merged 2 commits into from
Dec 1, 2025
Merged

Fix forward merge of release/25.12 into main #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a01924a
Pin Cython pre-3.2.0 and PyTest pre-9 (#345)
jakirkham Nov 25, 2025
91a5c74
fix merge conflicts
alexbarghi-nv Nov 25, 2025
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
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-129_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cugraph==26.2.*,>=0.0.0a0
- cuml==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cython>=3.0.0
- cython>=3.0.0,<3.2.0a0
- doxygen
- gcc_linux-aarch64=14.*
- graphviz
Expand All @@ -37,11 +37,11 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-forked
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- rapids-build-backend>=0.4.0,<0.5.0.dev0
- rmm==26.2.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-129_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cugraph==26.2.*,>=0.0.0a0
- cuml==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cython>=3.0.0
- cython>=3.0.0,<3.2.0a0
- doxygen
- gcc_linux-64=14.*
- graphviz
Expand All @@ -37,11 +37,11 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-forked
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- rapids-build-backend>=0.4.0,<0.5.0.dev0
- rmm==26.2.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-130_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cugraph==26.2.*,>=0.0.0a0
- cuml==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cython>=3.0.0
- cython>=3.0.0,<3.2.0a0
- doxygen
- gcc_linux-aarch64=14.*
- graphviz
Expand All @@ -37,11 +37,11 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-forked
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- rapids-build-backend>=0.4.0,<0.5.0.dev0
- rmm==26.2.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-130_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cugraph==26.2.*,>=0.0.0a0
- cuml==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cython>=3.0.0
- cython>=3.0.0,<3.2.0a0
- doxygen
- gcc_linux-64=14.*
- graphviz
Expand All @@ -37,11 +37,11 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-forked
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- rapids-build-backend>=0.4.0,<0.5.0.dev0
- rmm==26.2.*,>=0.0.0a0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/pylibwholegraph/recipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ requirements:
- ${{ stdlib("c") }}
host:
- cuda-version =${{ cuda_version }}
- cython >=3.0.0
- cython >=3.0.0,<3.2.0a0
- pip
- libwholegraph =${{ version }}
- python =${{ py_version }}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ dependencies:
common:
- output_types: [conda, pyproject, requirements]
packages:
- cython>=3.0.0
- cython>=3.0.0,<3.2.0a0
python_run_pylibwholegraph:
common:
- output_types: [conda, pyproject, requirements]
Expand Down Expand Up @@ -345,7 +345,7 @@ dependencies:
common:
- output_types: [conda, pyproject, requirements]
packages:
- pytest
- pytest<9.0.0a0
- pytest-benchmark
- pytest-cov
- pytest-xdist
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-129_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- torchdata
name: cugraph_pyg_dev_cuda-129_arch-aarch64
2 changes: 1 addition & 1 deletion python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-129_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- torchdata
name: cugraph_pyg_dev_cuda-129_arch-x86_64
2 changes: 1 addition & 1 deletion python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-130_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- torchdata
name: cugraph_pyg_dev_cuda-130_arch-aarch64
2 changes: 1 addition & 1 deletion python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-130_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraph==26.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- pytest<9.0.0a0
- pytorch_geometric>=2.5,<2.7
- torchdata
name: cugraph_pyg_dev_cuda-130_arch-x86_64
2 changes: 1 addition & 1 deletion python/cugraph-pyg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ test = [
"cugraph==26.2.*,>=0.0.0a0",
"cuml==26.2.*,>=0.0.0a0",
"ogb",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"pytest<9.0.0a0",
"sentence-transformers",
"torch>=2.9.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down
4 changes: 2 additions & 2 deletions python/pylibwholegraph/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ dependencies = [

[project.optional-dependencies]
test = [
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-forked",
"pytest-xdist",
"pytest<9.0.0a0",
"scipy",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

Expand All @@ -49,7 +49,7 @@ dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.30.4",
"cython>=3.0.0",
"cython>=3.0.0,<3.2.0a0",
"libraft==26.2.*,>=0.0.0a0",
"librmm==26.2.*,>=0.0.0a0",
"libwholegraph==26.2.*,>=0.0.0a0",
Expand Down
Loading