Mergeback (v3.3.x) #4930
Merged
Mergeback (v3.3.x) #4930
Conversation
This file contains 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
* unpin shapely * update whatsnew
* Use setuptools_scm release-branch-semver version_scheme. * Properly handle all possible scm-rtd combinations. * What's new entry. * Use git stash to protect setuptools_scm from RTD. * Better version badges. * Better use of git stash. * Substitute commit SHAs in place of versions where appropriate. * Make rtd_version safe for use in shields.io badges. * Make rtd_version safe for use in shields.io badges.
* v3.3.x: Better handle `setuptools_scm` versioning (SciTools#4926) Unpin shapely (SciTools#4925) # Conflicts: # requirements/ci/nox.lock/py310-linux-64.lock # requirements/ci/nox.lock/py38-linux-64.lock # requirements/ci/nox.lock/py39-linux-64.lock
trexfeathers
previously requested changes
Aug 25, 2022
There was a problem hiding this comment.
This looks great. I've just asked @stephenworsley to also regenerate the lock-files, since both v3.3.x and main have had their own lock-file updates at different times, and I don't want to risk any confusion.
From further discussion: we have worked out that the lock-files on |
trexfeathers
approved these changes
Aug 25, 2022
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.
Update main with changes to v3.3.x.
NOTE: Should be merged without squashing.