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

Jump to bottom

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

merged 2 commits into from
May 11, 2020

Conversation

rbuffat
Copy link
Contributor

@rbuffat rbuffat commented May 9, 2020 •
edited
Loading

Fix for #897

The path = GDALDataFinder().search_wheel() from rasterio is missing in Fiona: rasterio/rasterio@059ad3e#diff-bcec099fb5186938da74b5bfc04c1476

@rbuffat
Copy link
Contributor Author

rbuffat commented May 10, 2020

@sgillies Should this also be applied to GDALEnv https://github.com/Toblerity/Fiona/blob/maint-1.8/fiona/_env.pyx#L400

GDALDataFinder().search_wheel() is also not included in GDALEnv in rasterio: https://github.com/mapbox/rasterio/blob/master/rasterio/_env.pyx#L346

sgillies
sgillies approved these changes May 11, 2020
View reviewed changes
Copy link
Member

@sgillies sgillies left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch @rbuffat . Thanks for the user support!

No need to change the GDALEnv class. At least not for this issue.

@sgillies sgillies added the bug label May 11, 2020
@sgillies sgillies added this to the 1.8.14 milestone May 11, 2020
@sgillies
Copy link
Member

Ah, a GDAL project change broke one of our tests: https://github.com/Toblerity/Fiona/blob/maint-1.8/tests/test_collection.py#L866-L870. @rbuffat I'll fix this.

@rbuffat
Copy link
Contributor Author

rbuffat commented May 11, 2020

@sgillies I created a PR in #899, sorry I should have mentioned it.

@coveralls
Copy link

coveralls commented May 11, 2020 •
edited
Loading

Coverage Status

Coverage decreased (-0.2%) to 83.151% when pulling fad7ed5 on rbuffat:search_gdadata_in_wheel into 8a0d1c5 on Toblerity:maint-1.8.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.2%) to 83.151% when pulling 4a701c3 on rbuffat:search_gdadata_in_wheel into e1f0e1b on Toblerity:maint-1.8.

@sgillies sgillies merged commit 9c8ad2e into Toblerity:maint-1.8 May 11, 2020
@rbuffat rbuffat deleted the search_gdadata_in_wheel branch May 12, 2020 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgillies sgillies sgillies approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
1.8.14
Development

Successfully merging this pull request may close these issues.
3 participants
@rbuffat @sgillies @coveralls