MAINT: additional SciPy 1.5.2 backports #12596
Merged
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
* CI: Add GCC 4.8 entry to travis build matrix * CI: Fix native code coverage on travis
Cython now complains if the types of the two branches in the ternary statement do not match (here 1D vs 2D).
* update SciPy `1.5.2` release notes following a second round of backports after the first attempt at wheel builds failed
tylerjereddy
commented
Jul 22, 2020
| @@ -122,8 +122,19 @@ matrix: | |||
| - NUMPYSPEC="numpy==1.17.4" | |||
| - USE_SDIST=1 | |||
| - python: 3.6 | |||
| if: type = pull_request | |||
| name: "Wheel, Optimised, GCC 4.8" | |||
There was a problem hiding this comment.
the test incantation command is different on the older branch it seems.. since it included a COVERAGE entry already I left it alone, but not sure what will happen..
| @@ -861,7 +861,11 @@ def from_euler(cls, seq, angles, degrees=False): | |||
| "num_axes), got {}.".format(angles.shape)) | |||
|
|
|||
| quat = _elementary_quat_compose(seq, angles, intrinsic) | |||
| return cls(quat[0] if is_single else quat, normalize=False, copy=False) | |||
|
|
|||
There was a problem hiding this comment.
The quat object above may be slightly different vs. the one Thomas patched on master because of seq.encode()
I think that's fine. |
|
CI is all-green, no objections, backport PR so merging. |
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.
1.5.2failed, so a few more backports are added here:seq.encode()before/after difference vs.masterI think)v1.5.2tag was never pushed, but the remotemaintenance/1.5.xbranch is protected , I've opted to delete thev1.5.2tag locally and it will most likely be reassigned to a non-RELcommit (i.e., the most recent commit at release prepartion time, which might be the merge commit from this PR when it is ready)1.5.2release notes to reflect the additional backports included here