Minimal working shapely package with pygeos code included#1237
Merged
jorisvandenbossche merged 3 commits intoshapely:mainfrom Dec 1, 2021
Merged
Minimal working shapely package with pygeos code included#1237jorisvandenbossche merged 3 commits intoshapely:mainfrom
jorisvandenbossche merged 3 commits intoshapely:mainfrom
Conversation
This was referenced Dec 1, 2021
Collaborator
|
Looks good @jorisvandenbossche ! |
Member
Author
|
Since this blocks other PRs, and is mostly some moving things around and renaming, going to merge this. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After merging in the https://github.com/pygeos/pygeos repo into Shapely, this are some minimal changes to get a the shapely package in a "working state":
/pygeos/*directory into/shapely/*. The only conflict isstrtree.py, so the pygeos version is temporarily namedstrtree_pygeos.py(and in a follow-up we need to merge both strtree files)setup_shapely.pyfor now, we can in a follow-up consolidate the setup files (the exact setup arguments, author, maintainer, description, etc)geometry.pyto_geometry.py, because it otherwise conflicts withgeometry/__init__.pysubmodule (and therefore also renamed_geometry.pyxto_geometry_helpers.pyx). If there are other suggestions for names, that's certainly welcome.With those changes, building and installing the new shapely package works (
python setup.py build_ext -i/python setup.py develop/pip install -e . --no-build-isolation), and the package is in a working state: it imports, most functionality works, the tests run (but there are still a bunch of failures)(it's probably easiest to check the commits separately)
cc @sgillies @caspervdw