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.

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

use _shim3.c for gdal >3.0 #807

Merged
merged 1 commit into from
Oct 22, 2019
Merged

Conversation

rbuffat
Copy link
Contributor

@rbuffat rbuffat commented Oct 22, 2019

Use _shim3.c for gdal >= 3.0

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 82.85% when pulling 38caaa0 on rbuffat:fix_setuppy into 5792747 on Toblerity:maint-1.8.

@sgillies sgillies merged commit 8886a2a into Toblerity:maint-1.8 Oct 22, 2019
@sgillies sgillies mentioned this pull request Oct 22, 2019
@@ -261,7 +261,7 @@ def run(self):
log.info("Building Fiona for gdal 1.x: {0}".format(gdalversion))
ext_modules.append(
Extension('fiona._shim', ['fiona/_shim1.c'], **ext_options))
else:
elif gdal_minor_version == 2:
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be gdal_major_version instead of gdal_minor_version I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh no! yes, that was my mistake!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants