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 Cargo workspace #78

Merged
merged 10 commits into from
Dec 3, 2024
Merged

Use Cargo workspace #78

merged 10 commits into from
Dec 3, 2024

Conversation

DarkaMaul
Copy link
Collaborator

To reduce deduplication between our two rust crates, use a workspace to manage shared dependencies.

dependabot bot and others added 8 commits November 28, 2024 02:49
Updates the requirements on [cryptography](https://github.com/pyca/cryptography) to permit the latest version.

Updates `cryptography` to 44.0.0
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@43.0.0...44.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  dependency-group: python
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Alexis <[email protected]>
@DarkaMaul DarkaMaul marked this pull request as ready for review December 2, 2024 16:49
@DarkaMaul DarkaMaul marked this pull request as draft December 2, 2024 16:49
@DarkaMaul
Copy link
Collaborator Author

DarkaMaul commented Dec 2, 2024

There is some issue with the Windows CI build - back to Draft status until resolved (something along with setting CARGO_TARGET_DIR)

@DarkaMaul DarkaMaul marked this pull request as ready for review December 3, 2024 10:04
Cargo.toml Show resolved Hide resolved
Signed-off-by: William Woodruff <[email protected]>
Copy link
Member

@woodruffw woodruffw left a comment

Choose a reason for hiding this comment

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

LGTM; I cleaned up the old lockfiles as well.

It doesn't seem to be affecting the CI, but make dev produces a strange error for me locally:

    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.05s
📦 Built wheel for abi3 Python ≥ 3.9 to /var/folders/k6/zk7vnkms1m73w0vrxjm7b2s40000gn/T/.tmprjlaQs/rfc3161_client-0.0.5-cp39-abi3-macosx_11_0_arm64.whl
✏️  Setting installed package as editable
💥 maturin failed
  Caused by: failed to list package files

@DarkaMaul have you seen that before?

@woodruffw woodruffw merged commit 600e2f0 into main Dec 3, 2024
34 checks passed
@woodruffw woodruffw deleted the dm/use-workspace branch December 3, 2024 21:22
@DarkaMaul
Copy link
Collaborator Author

LGTM; I cleaned up the old lockfiles as well.

It doesn't seem to be affecting the CI, but make dev produces a strange error for me locally:

    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.05s
📦 Built wheel for abi3 Python ≥ 3.9 to /var/folders/k6/zk7vnkms1m73w0vrxjm7b2s40000gn/T/.tmprjlaQs/rfc3161_client-0.0.5-cp39-abi3-macosx_11_0_arm64.whl
✏️  Setting installed package as editable
💥 maturin failed
  Caused by: failed to list package files

@DarkaMaul have you seen that before?

Never in my local tests.

It seems, it's coming from :

https://github.com/PyO3/maturin/blob/cde210bac7e4e9bef14ad8c823b3adc09d399934/src/develop.rs#L263-L286

fn fix_direct_url(
    build_context: &BuildContext,
    python: &Path,
    install_backend: &InstallBackend,
) -> Result<()> {
    println!("✏️  Setting installed package as editable");
    let mut cmd = install_backend.make_command(python);
    let cmd = cmd.args(["show", "--files", &build_context.metadata23.name]);
    debug!("running {:?}", cmd);
    let output = cmd.output()?;
    ensure!(output.status.success(), "failed to list package files");
...

Which runs:

uv pip show --files rfc3161-client

Maybe the output of this command could help us in understanding what happens?

@woodruffw
Copy link
Member

Maybe the output of this command could help us in understanding what happens?

Hmm:

$ uv pip show --files rfc3161-client
error: unexpected argument '--files' found

  tip: to pass '--files' as a value, use '-- --files'

Usage: uv pip show [OPTIONS] [PACKAGE]...

For more information, try '--help'.

@woodruffw
Copy link
Member

Ah, this was caused by me being on uv 0.4.x. Upgrading fixed it!

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.

2 participants