Merge pull request #1463 from jameslamb/branch-24.12-merge-24.10

Merge branch-24.10 into branch-24.12
rapidsai · Sep 25, 2024 · 2f4a108 · 2f4a108
2 parents 33404e8 + a9ad86e
commit 2f4a108
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -24,7 +24,7 @@ NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
 NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 
 # Need to distutils-normalize the original version
-NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
+NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")
 
 echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
 

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -28,12 +28,12 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numpy>=1.23,<2.0a0
+- numpy>=1.23,<3.0a0
 - numpydoc
 - nvcc_linux-64=11.8
 - osmnx>=1.9.3
 - pre-commit
-- proj >=9.3.0,<9.3.1.0a0
+- proj
 - pydata-sphinx-theme!=0.14.2
 - pydeck
 - pylibcudf==24.12.*,>=0.0.0a0

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -31,11 +31,11 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numpy>=1.23,<2.0a0
+- numpy>=1.23,<3.0a0
 - numpydoc
 - osmnx>=1.9.3
 - pre-commit
-- proj >=9.3.0,<9.3.1.0a0
+- proj
 - pydata-sphinx-theme!=0.14.2
 - pydeck
 - pylibcudf==24.12.*,>=0.0.0a0

diff --git a/conda/recipes/cuproj/meta.yaml b/conda/recipes/cuproj/meta.yaml
@@ -64,7 +64,7 @@ requirements:
     - rapids-build-backend >=0.3.0,<0.4.0.dev0
     - librmm ={{ minor_version }}
     - scikit-build-core >=0.10.0
-    - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+    - proj
     - sqlite
   run:
     {% if cuda_major == "11" %}

diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml
@@ -77,7 +77,7 @@ requirements:
     - cudf ={{ minor_version }}
     - pylibcudf ={{ minor_version }}
     - geopandas >=1.0.0
-    - numpy >=1.23,<2.0a0
+    - numpy >=1.23,<3.0a0
     - python
     - rmm ={{ minor_version }}
 

diff --git a/conda/recipes/libcuspatial/meta.yaml b/conda/recipes/libcuspatial/meta.yaml
@@ -49,7 +49,7 @@ requirements:
     - libcudf ={{ minor_version }}
     - librmm ={{ minor_version }}
     - sqlite
-    - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+    - proj
 
 outputs:
   - name: libcuspatial
@@ -85,7 +85,7 @@ outputs:
         - libcudf ={{ minor_version }}
         - librmm ={{ minor_version }}
         - sqlite
-        - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+        - proj
     test:
       commands:
         - test -f $PREFIX/lib/libcuspatial.so

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -180,7 +180,7 @@ dependencies:
         packages:
           - c-compiler
           - cxx-compiler
-          - proj >=9.3.0,<9.3.1.0a0  # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
+          - proj
           - sqlite
     specific:
       - output_types: conda
@@ -400,7 +400,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - &geopandas geopandas>=1.0.0
-          - &numpy numpy>=1.23,<2.0a0
+          - &numpy numpy>=1.23,<3.0a0
   test_python_cuspatial:
     common:
       - output_types: [conda, requirements, pyproject]

diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml
@@ -45,7 +45,7 @@ classifiers = [
 test = [
     "cuspatial==24.12.*,>=0.0.0a0",
     "geopandas>=1.0.0",
-    "numpy>=1.23,<2.0a0",
+    "numpy>=1.23,<3.0a0",
     "pyproj>=3.6.0,<3.7a0",
     "pytest",
     "pytest-cov",

diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml
@@ -34,7 +34,7 @@ dependencies = [
     "geopandas>=1.0.0",
     "libcudf==24.12.*,>=0.0.0a0",
     "libcuspatial==24.12.*,>=0.0.0a0",
-    "numpy>=1.23,<2.0a0",
+    "numpy>=1.23,<3.0a0",
     "rmm==24.12.*,>=0.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [