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.

Sign up for GitHub

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

Jump to bottom

bump xwin version #80

Merged
merged 5 commits into from
Nov 13, 2023
Merged

bump xwin version #80

merged 5 commits into from
Nov 13, 2023

Conversation

Owen-CH-Leung
Copy link
Contributor

Further to this issue, I've created a fix in xwin crate to support custom ca cert when downloading microsoft CRT files. The PR has been merged and a new release 0.4.0 is available

Jake-Shadle/xwin#104
https://github.com/Jake-Shadle/xwin/releases

Hence this PR wants to bump up the version of xwin so that other upstream projects like maturin can benefit from this extra feature also

@Owen-CH-Leung Owen-CH-Leung marked this pull request as draft November 8, 2023 08:14
@Owen-CH-Leung
Copy link
Contributor Author

Owen-CH-Leung commented Nov 8, 2023 •
edited
Loading

My bad - looks like xwin 0.4.0 includes some other breaking changes...I'll look into it and if I can fix that

@Owen-CH-Leung Owen-CH-Leung marked this pull request as ready for review November 9, 2023 11:08
@Owen-CH-Leung
Copy link
Contributor Author

@messense Can I get your feedback for this PR ? Thanks

@messense
Copy link
Member

To be able to use in maturin, xwin also need to support custom ca root when building with rustls. The wheels we publish to pypi are compiled with rustls.

@Owen-CH-Leung Owen-CH-Leung mentioned this pull request Nov 10, 2023
Merged
@messense
Copy link
Member

FYI, we also have an example of custom TLS CA support in maturin upload: https://github.com/PyO3/maturin/blob/e57405b3b35ffdf79d9b5052f64464752c434b28/src/upload.rs#L373-L418

@Owen-CH-Leung
Copy link
Contributor Author

FYI, we also have an example of custom TLS CA support in maturin upload: https://github.com/PyO3/maturin/blob/e57405b3b35ffdf79d9b5052f64464752c434b28/src/upload.rs#L373-L418

Thanks. This is really helpful! I'll modify my PR in xwin soon

@Owen-CH-Leung
Copy link
Contributor Author

@messense Can I confirm that the maturin docker image was also built using the rustls feature ? Thanks

@messense
Copy link
Member

Yes, it's compiled with default features so rustls.

https://github.com/PyO3/maturin/blob/12d2e6ae47618e956eaaf912c7ee8becdd14cd71/Dockerfile#L35

@Owen-CH-Leung
Copy link
Contributor Author

Yes, it's compiled with default features so rustls.

https://github.com/PyO3/maturin/blob/12d2e6ae47618e956eaaf912c7ee8becdd14cd71/Dockerfile#L35

Thanks.

I've updated my PR to use 0.5.0 and provide custom http agent to pass along to xwin. Let me know what you think

messense
messense approved these changes Nov 13, 2023
View reviewed changes
Copy link
Member

@messense messense left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@messense messense merged commit 3b3ef56 into rust-cross:main Nov 13, 2023
21 checks passed
@Owen-CH-Leung
Copy link
Contributor Author

Thanks @messense !

Do we have plan to bump up the version of this crate so that we can update maturin also ?

@messense
Copy link
Member

messense commented Nov 14, 2023 •
edited
Loading

Will release cargo-xwin and update version in maturin after releasing a new patch version of maturin because this has bumpped MSRV to 1.67.

@Owen-CH-Leung
Copy link
Contributor Author

Thanks. Looking forward!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@messense messense messense approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Owen-CH-Leung @messense