Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: modflow6/pixi.toml

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mf6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: modflow6/pixi.toml

- name: Install dependencies
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: modflow6/pixi.toml

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rtd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.9.6
with:
pixi-version: v0.41.4
pixi-version: v0.70.1
manifest-path: modflow6/pixi.toml

- name: Install Python dependencies
Expand Down
11 changes: 10 additions & 1 deletion flopy/utils/geospatial_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,16 @@ def shape(self):
"""
if self.__shapefile is not None:
if self._shape is None:
self._shape = self.__shapefile.Shape._from_geojson(self.__geo_interface)
geo_iface = self.__geo_interface
# pyshp >= 3.0.11 requires list (not tuple) for Point coordinates
if geo_iface.get("type") == "Point" and isinstance(
geo_iface.get("coordinates"), tuple
):
geo_iface = {
**geo_iface,
"coordinates": list(geo_iface["coordinates"]),
}
self._shape = self.__shapefile.Shape._from_geojson(geo_iface)
return self._shape

@property
Expand Down
Loading