Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependency on cfg-if #240

Merged
merged 4 commits into from
Jan 8, 2022
Merged

Bump dependency on cfg-if #240

merged 4 commits into from
Jan 8, 2022

Conversation

adamreichold
Copy link
Member

So that we do not pull in the pre-1.0 version into other crates dependency tree.

@davidhewitt
Copy link
Member

davidhewitt commented Jan 5, 2022

Note that this bumps MSRV (I can't remember to what). PyO3 was blocked on updating to 1.0 until we recently raised MSRV to 1.48 (for upcoming 0.16 release). So this might not want to merge until we're ready to release 0.16 here too?

@adamreichold
Copy link
Member Author

Note that this bumps MSRV (I can't remember to what). PyO3 was blocked on updating to 1.0 until we recently raised MSRV to 1.48 (for upcoming 0.16 release). So this might not want to merge until we're ready to release 0.16 here too?

Ouch, sorry for not having this on the radar! So I think this meshes with the discussion in #236 (comment) and I think the best course would be to declare the main branch as what will be 0.16 in parallel to PyO3's 0.16 and I will try to cherry-picking the bug fixes on release-0.15 (which would be #222 and #235 only as the SliceBox type confusion only became a problem after allowing object arrays. (The type confusion is already there and we are doing UB according to Rust's alloc interface, but the underlying C malloc implementation will ignore the wrong layout we give to dealloc and only use the pointer which is correct.))

Would that be alright with you @kngwyu ? If so, we could merge this into main

@kngwyu
Copy link
Member

kngwyu commented Jan 6, 2022

I agree with the release of 0.15.1, but I don't think this PR is so urgent... Just waiting for a bit can be simpler, though I don't know the release plan of PyO3 0.16

@adamreichold
Copy link
Member Author

Just waiting for a bit can be simpler

Only if we decide to decouple the version numbers of PyO3 and rust-numpy as we already have breaking changes on main, e.g. PyArray::new became unsafe. If we want PyO3 0.16 to be matched with rust-numpy 0.16 (which I think would be nice), then we are already targeting 0.16 on main.

@kngwyu
Copy link
Member

kngwyu commented Jan 6, 2022

Ah OK, then I think your strategy is better.

@adamreichold
Copy link
Member Author

I pushed another commit here which aligns our MSRV on the main branch with that of PyO3's main branch. The release PR for the 0.15.1 bugfix release is ready as #245.

Cargo.toml Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
Copy link
Member

@davidhewitt davidhewitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks again!

@davidhewitt davidhewitt merged commit 4fb198f into PyO3:main Jan 8, 2022
@adamreichold adamreichold deleted the bump-cfg-if branch January 8, 2022 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants