bump geopandas to 1.x, drop fiona

rapidsai · Sep 9, 2024 · 9295c3f · 9295c3f
1 parent eaac568
commit 9295c3f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -145,42 +145,6 @@ pip install cuspatial-cu12 --extra-index-url=https://pypi.nvidia.com
 pip install cuspatial-cu11 --extra-index-url=https://pypi.nvidia.com
 ```
 
-#### Troubleshooting Fiona/GDAL versions
-
-cuSpatial depends on [`geopandas`](https://github.com/geopandas/geopandas), which uses [`fiona >= 1.8.19`](https://pypi.org/project/Fiona/), to read common GIS formats with GDAL.
-
-Fiona requires GDAL is already present on your system, but its minimum required version may be newer than the version of GDAL in your OS's package manager.
-
-Fiona checks the GDAL version at install time and fails with an error like this if a compatible version of GDAL isn't installed:
-```
-ERROR: GDAL >= 3.2 is required for fiona. Please upgrade GDAL.
-```
-
-There are two ways to fix this:
-
-1. Install a version of GDAL that meets fiona's minimum required version
-  * Ubuntu users can install a newer GDAL with the [UbuntuGIS PPA](https://wiki.ubuntu.com/UbuntuGIS):
-    ```shell
-    sudo -y add-apt-repository ppa:ubuntugis/ppa
-    sudo apt install libgdal-dev
-    ```
-  * Rocky Linux users can install a newer GDAL as follows
-    ```shell
-    yum update -y
-    yum config-manager --set-enabled powertools
-    yum update -y
-    yum install -y gdal-devel
-    ```
-2. Pin fiona's version to a range that's compatible with your version of `libgdal-dev`
-  * For Ubuntu20.04 ([GDAL v3.0.4](https://packages.ubuntu.com/focal/libgdal-dev)):
-    ```shell
-    pip install --no-binary fiona --extra-index-url=https://pypi.nvidia.com cuspatial-cu12 'fiona>=1.8.19,<1.9'
-    ```
-  * For Ubuntu22.04 ([GDAL v3.4.1](https://packages.ubuntu.com/jammy/libgdal-dev)):
-    ```shell
-    pip install --no-binary fiona --extra-index-url=https://pypi.nvidia.com cuspatial-cu12 'fiona>=1.9'
-    ```
-
 ### Build/Install from source
 
 To build and install cuSpatial from source please see the [build documentation](https://docs.rapids.ai/api/cuspatial/stable/developer_guide/build.html).

diff --git a/ci/test_wheel_cuproj.sh b/ci/test_wheel_cuproj.sh
@@ -6,30 +6,16 @@ set -eou pipefail
 mkdir -p ./dist
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-# install build dependencies for fiona
-if type -f yum > /dev/null 2>&1; then
-  yum update -y
-  # some of gdal-devel's dependencies, like 'libdap', come from the powertools repo
-  yum config-manager --set-enabled powertools
-  yum update -y
-  yum install -y gdal-devel
-else
-  apt update
-  DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libgdal-dev
-fi
-
 # Download the cuproj and cuspatial built in the previous step
 RAPIDS_PY_WHEEL_NAME="cuproj_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist
 RAPIDS_PY_WHEEL_NAME="cuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist
 RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp ./dist
 
 # echo to expand wildcard before adding `[extra]` requires for pip
 python -m pip install \
-  --no-binary 'fiona' \
   "$(echo ./dist/cuspatial*.whl)" \
   "$(echo ./dist/cuproj*.whl)[test]" \
-  "$(echo ./dist/libcuspatial*.whl)" \
-  'fiona>=1.8.19,<1.9'
+  "$(echo ./dist/libcuspatial*.whl)"
 
 rapids-logger "pytest cuproj"
 pushd python/cuproj/cuproj

diff --git a/ci/test_wheel_cuspatial.sh b/ci/test_wheel_cuspatial.sh
@@ -6,28 +6,14 @@ set -eou pipefail
 mkdir -p ./dist
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-# install build dependencies for fiona
-if type -f yum > /dev/null 2>&1; then
-  yum update -y
-  # some of gdal-devel's dependencies, like 'libdap', come from the powertools repo
-  yum config-manager --set-enabled powertools
-  yum update -y
-  yum install -y gdal-devel
-else
-  apt update
-  DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends libgdal-dev
-fi
-
 # Download the cuspatial and libcuspatial built in the previous step
 RAPIDS_PY_WHEEL_NAME="cuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist
 RAPIDS_PY_WHEEL_NAME="libcuspatial_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp ./dist
 
 # echo to expand wildcard before adding `[extra]` requires for pip
 python -m pip install \
-  --no-binary 'fiona' \
   "$(echo ./dist/cuspatial*.whl)[test]" \
-  "$(echo ./dist/libcuspatial*.whl)" \
-  'fiona>=1.8.19,<1.9'
+  "$(echo ./dist/libcuspatial*.whl)"
 
 rapids-logger "pytest cuspatial"
 pushd python/cuspatial/cuspatial

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -19,8 +19,7 @@ dependencies:
 - cython>=3.0.0
 - doxygen
 - gcc_linux-64=11.*
-- geopandas<1
-- geopandas>=0.11.0
+- geopandas>=1.0.0
 - ipython
 - ipywidgets
 - libcudf==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
@@ -22,8 +22,7 @@ dependencies:
 - cython>=3.0.0
 - doxygen
 - gcc_linux-64=11.*
-- geopandas<1
-- geopandas>=0.11.0
+- geopandas>=1.0.0
 - ipython
 - ipywidgets
 - libcudf==24.10.*,>=0.0.0a0

diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml
@@ -76,7 +76,7 @@ requirements:
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     - cudf ={{ minor_version }}
     - pylibcudf ={{ minor_version }}
-    - geopandas >=0.11.0
+    - geopandas >=1.0.0
     - numpy >=1.23,<2.0a0
     - python
     - rmm ={{ minor_version }}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -376,9 +376,6 @@ dependencies:
   # TODO: Remove geopandas.dataset usage in cuspatial_api_examples.ipynb
   test_notebooks:
     common:
-      - output_types: [conda, requirements, pyproject]
-        packages:
-          - geopandas<1
       - output_types: conda
         packages:
           - osmnx>=1.9.3
@@ -405,7 +402,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - geopandas>=0.11.0
+          - &geopandas geopandas>=1.0.0
           - &numpy numpy>=1.23,<2.0a0
   test_python_cuspatial:
     common:
@@ -422,7 +419,7 @@ dependencies:
           - pytest
           - pytest-cov
           - pytest-xdist
-          - geopandas>=0.11.0
+          - *geopandas
       - output_types: [requirements, pyproject]
         packages:
           - pyproj>=3.6.0,<3.7a0

diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml
@@ -44,7 +44,7 @@ classifiers = [
 [project.optional-dependencies]
 test = [
     "cuspatial==24.10.*,>=0.0.0a0",
-    "geopandas>=0.11.0",
+    "geopandas>=1.0.0",
     "numpy>=1.23,<2.0a0",
     "pyproj>=3.6.0,<3.7a0",
     "pytest",

diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml
@@ -31,7 +31,7 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.10"
 dependencies = [
     "cudf==24.10.*,>=0.0.0a0",
-    "geopandas>=0.11.0",
+    "geopandas>=1.0.0",
     "libcudf==24.10.*,>=0.0.0a0",
     "libcuspatial==24.10.*,>=0.0.0a0",
     "numpy>=1.23,<2.0a0",