Merge shapely-2.0 branch into main#1211
Merged
jorisvandenbossche merged 18 commits intomainfrom Nov 8, 2021
Merged
Conversation
Member
|
And by "to master", you mean "to main". Makes sense to merge this soon. |
Member
Author
Old habits .. In the title I had it correctly :) |
* keep tests for immutability
07fc570 to
12de7a5
Compare
2eed2d0 to
2aedc0d
Compare
Member
Author
|
@sgillies are you OK with going forward here? This is all content from previous PRs (but so essentially moving the shapely-2.0 branch to as the main branch) I would prefer to merge this soon, to avoid further conflicts (and more hairy rebases) with other PRs. |
Contributor
|
@jorisvandenbossche let's do it! |
Member
Author
|
OK, done :) |
Member
Author
28 tasks
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
4 participants
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.
xref #962 (comment)
This contains all changes that were made up to now for the shapely-2.0 branch. Now we have branched for maint-1.8, I think it would be a good time to move the shapely-2.0 change into master.
I would propose to merge this PR with the "Rebase and merge" strategy to preserve the commits here (directly mapping to one of the PRs). Another option is to rename the shapely-2.0 branch to master, but doing it through this PR seems more transparent.