From be73c8e4bbb9017e8b3ecc4bf501e0bdd4f41a24 Mon Sep 17 00:00:00 2001 From: Sebastian Berg Date: Tue, 24 Sep 2024 03:03:17 +0200 Subject: [PATCH 1/2] Remove NumPy <2 pin, remove proj pin (#1441) This PR removes the NumPy<2 pin which is expected to work for RAPIDS projects once CuPy 13.3.0 is released (CuPy 13.2.0 had some issues preventing the use with NumPy 2). Also contributes to https://github.com/rapidsai/build-planning/issues/56 by removing the pin on `proj` (which allows this project to work with newer `fmt` / `spdlog`, in sync with conda-forge). Authors: - Sebastian Berg (https://github.com/seberg) - Bradley Dice (https://github.com/bdice) - James Lamb (https://github.com/jameslamb) - https://github.com/jakirkham Approvers: - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cuspatial/pull/1441 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-125_arch-x86_64.yaml | 4 ++-- conda/recipes/cuproj/meta.yaml | 2 +- conda/recipes/cuspatial/meta.yaml | 2 +- conda/recipes/libcuspatial/meta.yaml | 4 ++-- dependencies.yaml | 4 ++-- python/cuproj/pyproject.toml | 2 +- python/cuspatial/pyproject.toml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 5ac2a6b9c..6526e9d5f 100644 --- 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.10.*,>=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 index 7c2ca25d4..9d0e65000 100644 --- 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.10.*,>=0.0.0a0 diff --git a/conda/recipes/cuproj/meta.yaml b/conda/recipes/cuproj/meta.yaml index 0096561fe..29d590bc0 100644 --- 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 index c7c0d780c..9f37d47e9 100644 --- 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 index 177037568..3e212690c 100644 --- 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 index 3ac92dfbf..8e4c0964e 100644 --- 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 index fc4b99d54..f7e920543 100644 --- a/python/cuproj/pyproject.toml +++ b/python/cuproj/pyproject.toml @@ -45,7 +45,7 @@ classifiers = [ test = [ "cuspatial==24.10.*,>=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 index 3a850030e..94b401472 100644 --- a/python/cuspatial/pyproject.toml +++ b/python/cuspatial/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "geopandas>=1.0.0", "libcudf==24.10.*,>=0.0.0a0", "libcuspatial==24.10.*,>=0.0.0a0", - "numpy>=1.23,<2.0a0", + "numpy>=1.23,<3.0a0", "rmm==24.10.*,>=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 = [ From 3d94becb14f017062c8e0fde71507f66c1dd33d4 Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:11:20 -0500 Subject: [PATCH 2/2] update update-version.sh to use packaging lib (#1462) --- ci/release/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 3f00dd7fb..03c05e9c4 100755 --- 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"