Skip to content

Commit

Permalink
Merge branch 'Toblerity:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
FreddieWitherden committed Dec 12, 2024
2 parents 20aba93 + 09a37a8 commit 1fd5065
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: startsWith(matrix.os, 'windows')

- name: Build wheels
uses: pypa/cibuildwheel@v2.21.3
uses: pypa/cibuildwheel@v2.22.0

- uses: actions/upload-artifact@v4
with:
Expand Down
9 changes: 6 additions & 3 deletions rtree/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:

try:
self.handle = self._create_idx_from_array(*arrays)
except AttributeError:
except NameError:
raise NotImplementedError(
"libspatialindex >= 2.1 needed for bulk insert"
)
Expand Down Expand Up @@ -1481,8 +1481,11 @@ class IndexStreamHandle(IndexHandle):
_create = core.rt.Index_CreateWithStream


class IndexArrayHandle(IndexHandle):
_create = core.rt.Index_CreateWithArray
try:
class IndexArrayHandle(IndexHandle):
_create = core.rt.Index_CreateWithArray
except AttributeError:
pass


class PropertyHandle(Handle):
Expand Down

0 comments on commit 1fd5065

Please sign in to comment.