merge master into abi3 branch to resolve conflicts #1237
Conversation
contributing.md: add note on benchmarking
migration guide: tiny typo fix
Tweak doc for PyDowncastError
Use stable Python 3.9 on CI
Move impl From for Py<T> to macros not used in rust-numpy
Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
Don't watch PYTHON_SYS_EXECUTABLE and PATH when unnecessary
Release 0.12.2
Update environment setting for Github Actions API updates
Fix MSRV CI to correctly use MSRV
| @@ -16,13 +20,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. | |||
| ## [Unreleased] | |||
There was a problem hiding this comment.
Something's gone awry here - we've got two ## [Unreleased] sections. Might be worth holding a sec to fix until I merge #1236 and maybe merge some of the other PRs so the changelog clashes get smoothed out.
There was a problem hiding this comment.
I did that intentionally when I added the original changelog entry. This conflict didn't impact the changelog.
There was a problem hiding this comment.
Ahhh, I see what happened. I'll fix.
|
Ah interesting, looks like the fix to CI for MSRV has found something on this branch too! 😄 |
|
Indeed it did. Will fix. |
|
Hmm that segfault is interesting 🤔 |
|
If it only reproduces on that one build, I'm not sure what to make of it :-/ |
|
I'm planning to drop Python 3.5 support very soon anyway (as part of 0.13). So if it's just that job let's merge this into abi3 branch anyway for now and I'll put up a PR to drop Python 3.5 support in the next day or two. |
|
Sounds great. |
|
yeah, just the one build :-/ |
|
👍 |
No description provided.