Skip to content

Restore shapely/geos.py to state at 1.5.9#327

Merged
sgillies merged 13 commits intomaint-1.5from
issue325
Oct 10, 2015
Merged

Restore shapely/geos.py to state at 1.5.9#327
sgillies merged 13 commits intomaint-1.5from
issue325

Conversation

@sgillies
Copy link
Copy Markdown
Contributor

@sgillies sgillies commented Oct 4, 2015

And move shapely/libgeos.py to shapely/_buildcfg.py. Now it's only ever imported by setup.py when building distributions.

Closes #325.

Status: 30%

Move shapely/libgeos.py to shapely/_buildcfg.py. It's only ever
imported by setup.py when building distributions.
Sean Gillies added 9 commits October 4, 2015 17:08
This means checking for imports of fiona or rasterio and trying
CDLL with DTLD_NOLOAD before falling back to the local copy of
the DLL.
Plus log format tweaks.
@sgillies
Copy link
Copy Markdown
Contributor Author

sgillies commented Oct 8, 2015

This PR also fixes #324. The script in Toblerity/Fiona#276 succeeds now, no matter whether you import fiona or shapely first. If fiona has already been imported, we try to reuse a DLL we find in its .dylibs directory in shapely.

@snorfalorpagus @mwtoews I would very much appreciate your 👀 on this. Getting a 1.5.13 release out soon would be a huge relief for me. This issue has been bugging me for tooooo long.

/cc @schwehr because you've recently filed a related issue.

@sgillies
Copy link
Copy Markdown
Contributor Author

sgillies commented Oct 8, 2015

And now we reuse any GEOS DLL that we can find already loaded on OS X, not just when the shapely module has its own .dylibs.

This is ready to be merged.

@sgillies
Copy link
Copy Markdown
Contributor Author

sgillies commented Oct 9, 2015

Barring objections, I'll merge this after lunch and release 1.5.13.

@coveralls
Copy link
Copy Markdown

Coverage Status

Changes Unknown when pulling ac31260 on issue325 into ** on maint-1.5**.

jorisvandenbossche pushed a commit to jorisvandenbossche/shapely that referenced this pull request Nov 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants