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

use file_name to get bindings manifest name #1828

Merged
merged 5 commits into from
Nov 2, 2023

Conversation

nreinicke
Copy link
Contributor

@nreinicke nreinicke commented Oct 30, 2023

Attempts to update how the python binding crate name is parsed by just taking the last member in the path rather than removing a given prefix.

With the existing code, in the new test, pyo3-mixed-workspace, the main_member_name gets parsed as rust/pyo3-mixed-workspace-py and then does not get added into the resulting workspace Cargo.toml file in the source distribution. This causes a failure when trying to install the package from the resulting source distribution.

The new test is based on this project structure: https://github.com/NREL/routee-compass

@netlify
Copy link

netlify bot commented Oct 30, 2023

Deploy Preview for maturin-guide ready!

Name Link
🔨 Latest commit 1e6d8d2
🔍 Latest deploy log https://app.netlify.com/sites/maturin-guide/deploys/654391763caef30008627aa5
😎 Deploy Preview https://deploy-preview-1828--maturin-guide.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@messense messense added the sdist Source distribution label Oct 31, 2023
@nreinicke
Copy link
Contributor Author

Sorry, I accidentally closed this by reference in a different PR

@nreinicke nreinicke reopened this Oct 31, 2023
@messense
Copy link
Member

messense commented Nov 1, 2023

The test failure on Windows is probably related to / v.s. \.

We can use path-slash crate to deal with that.

@messense messense added the CI-no-fail-fast If one job fails, allow the rest to keep testing label Nov 1, 2023
@messense messense merged commit 84b3dba into PyO3:main Nov 2, 2023
25 of 27 checks passed
@nreinicke nreinicke deleted the sdist-nested-workspace branch November 6, 2023 22:11
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Nov 15, 2023
https://build.opensuse.org/request/show/1126453
by user mia + anag+factory
- Update to 1.3.2
  * Switch to Ruff formatter
    gh#PyO3/maturin#1817
  * Upgrade ring to 0.17
    gh#PyO3/maturin#1819
  * Un-deprecate MATURIN_PEP517_ARGS env var
    gh#PyO3/maturin#1820
  * Add support for uniffi library mode
    gh#PyO3/maturin#1729
  * Fix missing member in Cargo.toml for sdist of nested workspace
    layout
    gh#PyO3/maturin#1828
  * Metadata: escape display name in email addresses
    gh#PyO3/maturin#1832
  * Fix rewriting workspace Cargo.toml in sdist
    gh#PyO3/maturin#1841
  * Fix glob workspace members matching in sdist
    gh#PyO3/maturin#1846
  * Add sdist tests for well-known downstream repositories
    gh#PyO3/maturin#1849
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-no-fail-fast If one job fails, allow the rest to keep testing sdist Source distribution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants