Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search wheel first to find GDAL_DATA #898

Merged
merged 2 commits into from
May 11, 2020
Merged

Search wheel first to find GDAL_DATA #898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a701c3
search wheel first, see https://github.com/mapbox/rasterio/commit/059…
rbuffat May 9, 2020
fad7ed5
Merge branch 'maint-1.8' into search_gdadata_in_wheel
rbuffat May 11, 2020
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
8 changes: 7 additions & 1 deletion fiona/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,14 @@ def wrapper(*args, **kwds):

if "GDAL_DATA" not in os.environ:

path = GDALDataFinder().search_wheel()

if path:
os.environ['GDAL_DATA'] = path
log.debug("GDAL data found in package, GDAL_DATA set to %r.", path)

# See https://github.com/mapbox/rasterio/issues/1631.
if GDALDataFinder().find_file("header.dxf"):
elif GDALDataFinder().find_file("header.dxf"):
log.debug("GDAL data files are available at built-in paths")

else:
Expand Down