Merge branch 'branch-25.06' into branch-25.08

gforsyth · gforsyth · commit 86f30666d2c7 · 2025-05-02T16:40:29.000-04:00
diff --git a/conda/environments/all_cuda-114_arch-aarch64.yaml b/conda/environments/all_cuda-114_arch-aarch64.yaml
@@ -24,7 +24,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-timeout
-- python>=3.10,<3.13
+- python>=3.10,<3.14
 - rapids-build-backend>=0.3.0,<0.4.0dev0
 - rapids-dask-dependency==25.8.*,>=0.0.0a0
 - setuptools>=64.0.0
diff --git a/conda/environments/all_cuda-114_arch-x86_64.yaml b/conda/environments/all_cuda-114_arch-x86_64.yaml
@@ -24,7 +24,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-timeout
-- python>=3.10,<3.13
+- python>=3.10,<3.14
 - rapids-build-backend>=0.3.0,<0.4.0dev0
 - rapids-dask-dependency==25.8.*,>=0.0.0a0
 - setuptools>=64.0.0
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -24,7 +24,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-timeout
-- python>=3.10,<3.13
+- python>=3.10,<3.14
 - rapids-build-backend>=0.3.0,<0.4.0dev0
 - rapids-dask-dependency==25.8.*,>=0.0.0a0
 - setuptools>=64.0.0
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -24,7 +24,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-timeout
-- python>=3.10,<3.13
+- python>=3.10,<3.14
 - rapids-build-backend>=0.3.0,<0.4.0dev0
 - rapids-dask-dependency==25.8.*,>=0.0.0a0
 - setuptools>=64.0.0
diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml
@@ -25,7 +25,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-timeout
-- python>=3.10,<3.13
+- python>=3.10,<3.14
 - rapids-build-backend>=0.3.0,<0.4.0dev0
 - rapids-dask-dependency==25.8.*,>=0.0.0a0
 - setuptools>=64.0.0
diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml
@@ -25,7 +25,7 @@ dependencies:
 - pytest
 - pytest-cov
 - pytest-timeout
-- python>=3.10,<3.13
+- python>=3.10,<3.14
 - rapids-build-backend>=0.3.0,<0.4.0dev0
 - rapids-dask-dependency==25.8.*,>=0.0.0a0
 - setuptools>=64.0.0
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -145,8 +145,12 @@ dependencies:
             packages:
               - python=3.12
           - matrix:
+              py: "3.13"
             packages:
-              - python>=3.10,<3.13
+              - python=3.13
+          - matrix:
+            packages:
+              - python>=3.10,<3.14
   run_python:
     common:
       - output_types: [conda, requirements, pyproject]
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,6 +34,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 [project.scripts]

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ classifiers = [`
`34`	`34`	`"Programming Language :: Python :: 3.10",`
`35`	`35`	`"Programming Language :: Python :: 3.11",`
`36`	`36`	`"Programming Language :: Python :: 3.12",`
	`37`	`+ "Programming Language :: Python :: 3.13",`
`37`	`38`	`]`
`38`	`39`
`39`	`40`	`[project.scripts]`