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

Add workspace lock file to sdist as a fallback #1362

Merged
merged 1 commit into from
Dec 19, 2022
Merged

Add workspace lock file to sdist as a fallback #1362

merged 1 commit into from
Dec 19, 2022

Conversation

messense
Copy link
Member

@messense messense commented Dec 19, 2022 •
edited
Loading

See sourmash-bio/sourmash#2393 (comment)

Figure out how to pull Cargo.lock from workspace root.

cc @luizirber

@messense messense added the sdist Source distribution label Dec 19, 2022
@netlify
Copy link

netlify bot commented Dec 19, 2022 •
edited
Loading

✅ Deploy Preview for maturin-guide ready!

Name Link
🔨 Latest commit 43998a2
🔍 Latest deploy log https://app.netlify.com/sites/maturin-guide/deploys/639fdcaa552e4e0009e61cf0
😎 Deploy Preview https://deploy-preview-1362--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 settings.

@messense
Copy link
Member Author

bors r+

bors bot added a commit that referenced this pull request Dec 19, 2022
@bors @messense
Merge #1362
3d212e7 
1362: Add workspace lock file to sdist as a fallback r=messense a=messense

See sourmash-bio/sourmash#2393 (comment)

> Figure out how to pull `Cargo.lock` from workspace root.

cc `@luizirber`

Co-authored-by: messense <messense@icloud.com>
@bors
Copy link
Contributor

bors bot commented Dec 19, 2022

Build failed:

@messense
Copy link
Member Author

bors retry

@luizirber
Copy link
Contributor

🎉 thanks for the PR =]

I tried it out in sourmash-bio/sourmash#2393 but it still doesn't quite work because I'm messing with manifest-path to pick up the crate Cargo.toml, while wanting to use the workspace Cargo.lock. Something like this structure:

.
├── Cargo.lock
├── Cargo.toml
├── pyproject.toml
└── src
    ├── python_package
    └── rust_crate
        └── Cargo.toml
  • If I try to use the workspace Cargo.toml (don't set manifest-path in pyproject.toml) , it doesn't find a valid package section.
  • If I set manifest-path to src/rust_crate/Cargo.toml, it works as long as I don't use --locked
  • If I use --locked, it fails because it doesn't recognize that it is a workspace (because the manifest-path is set to src/rust_crate/Cargo.toml, not the workspace one)

I started looking into the codebase earlier this week and writing a test case similar to the structure I just posted, but hit issues around the CargoToml parsing because it expects a non-workspace Cargo.toml, but going all the way to use the "official" cargo metadata was going to change a lot of code.

@bors
Copy link
Contributor

bors bot commented Dec 19, 2022

Build succeeded:

@bors bors bot merged commit 3c83f8f into PyO3:main Dec 19, 2022
@messense messense deleted the workspace-lockfile branch December 19, 2022 05:47
@messense
Copy link
Member Author

@luizirber Do you mean this workflow failure? https://github.com/sourmash-bio/sourmash/actions/runs/3728511524/jobs/6323587596, I think it's using maturin from pypi.

I tried build sdist for that PR locally with the main branch code of maturin

$ maturin sdist -o dist
  Downloaded primal-check v0.3.3
  Downloaded niffler v2.4.0
  Downloaded sorted-iter v0.1.8
  Downloaded counter v0.5.7
  Downloaded codepage-437 v0.1.0
  Downloaded murmurhash3 v0.0.5
  Downloaded typed-builder v0.11.0
  Downloaded piz v0.4.0
  Downloaded needletail v0.4.1
  Downloaded az v1.2.1
  Downloaded vec-collections v0.3.6
  Downloaded 11 crates (263.3 KB) in 2.01s
📦 Including license file "/Users/messense/Projects/sourmash/LICENSE"
🍹 Building a mixed python/rust project
🔗 Found cffi bindings
🐍 Using CPython 3.11 at /Users/messense/.pyenv/versions/3.11.0/bin/python3 to generate the cffi bindings
📡 Using build options features, locked, bindings from pyproject.toml
📦 Including files matching "include/sourmash.h"
📦 Built source distribution to dist/sourmash-4.6.1.tar.gz
$ tar -ztvf dist/sourmash-4.6.1.tar.gz
-rw-r--r--  0 0      0        2425 Jan  1  1970 sourmash-4.6.1/src/core/Cargo.toml
-rw-r--r--  0 501    20       4611 Dec 19 14:00 sourmash-4.6.1/src/core/CHANGELOG.md
-rw-r--r--  0 501    20       1551 Dec 19 14:00 sourmash-4.6.1/src/core/README.md
-rw-r--r--  0 501    20       4950 Dec 19 14:00 sourmash-4.6.1/src/core/benches/compute.rs
-rw-r--r--  0 501    20       2631 Dec 19 14:00 sourmash-4.6.1/src/core/benches/index.rs
-rw-r--r--  0 501    20       3027 Dec 19 14:00 sourmash-4.6.1/src/core/benches/minhash.rs
-rw-r--r--  0 501    20       1486 Dec 19 14:00 sourmash-4.6.1/src/core/benches/nodegraph.rs
-rw-r--r--  0 501    20       2207 Dec 19 14:00 sourmash-4.6.1/src/core/build.rs
-rw-r--r--  0 501    20        337 Dec 19 14:00 sourmash-4.6.1/src/core/cbindgen.toml
-rw-r--r--  0 501    20       2648 Dec 19 14:00 sourmash-4.6.1/src/core/examples/generate_mqfs.rs
-rw-r--r--  0 501    20       5535 Dec 19 14:00 sourmash-4.6.1/src/core/src/cmd.rs
-rw-r--r--  0 501    20      15198 Dec 19 14:00 sourmash-4.6.1/src/core/src/encodings.rs
-rw-r--r--  0 501    20       4881 Dec 19 14:00 sourmash-4.6.1/src/core/src/errors.rs
-rw-r--r--  0 501    20       4613 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/cmd/compute.rs
-rw-r--r--  0 501    20         17 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/cmd/mod.rs
-rw-r--r--  0 501    20       5505 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/hyperloglog.rs
-rw-r--r--  0 501    20       1018 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/index/mod.rs
-rw-r--r--  0 501    20       7198 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/index/revindex.rs
-rw-r--r--  0 501    20      12914 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/minhash.rs
-rw-r--r--  0 501    20        634 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/mod.rs
-rw-r--r--  0 501    20       6216 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/nodegraph.rs
-rw-r--r--  0 501    20       9511 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/signature.rs
-rw-r--r--  0 501    20       3462 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/storage.rs
-rw-r--r--  0 501    20       8404 Dec 19 14:00 sourmash-4.6.1/src/core/src/ffi/utils.rs
-rw-r--r--  0 501    20       3860 Dec 19 14:00 sourmash-4.6.1/src/core/src/from.rs
-rw-r--r--  0 501    20       6060 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/bigsi.rs
-rw-r--r--  0 501    20       5090 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/linear.rs
-rw-r--r--  0 501    20       9188 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/mod.rs
-rw-r--r--  0 501    20      21669 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/revindex.rs
-rw-r--r--  0 501    20      11808 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/sbt/mhbt.rs
-rw-r--r--  0 501    20       7022 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/sbt/mhmt.rs
-rw-r--r--  0 501    20      26865 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/sbt/mod.rs
-rw-r--r--  0 501    20        856 Dec 19 14:00 sourmash-4.6.1/src/core/src/index/search.rs
-rw-r--r--  0 501    20       1550 Dec 19 14:00 sourmash-4.6.1/src/core/src/lib.rs
-rw-r--r--  0 501    20        717 Dec 19 14:00 sourmash-4.6.1/src/core/src/prelude.rs
-rw-r--r--  0 501    20      27253 Dec 19 14:00 sourmash-4.6.1/src/core/src/signature.rs
-rw-r--r--  0 501    20       5123 Dec 19 14:00 sourmash-4.6.1/src/core/src/sketch/hyperloglog/estimators.rs
-rw-r--r--  0 501    20      11943 Dec 19 14:00 sourmash-4.6.1/src/core/src/sketch/hyperloglog/mod.rs
-rw-r--r--  0 501    20      51662 Dec 19 14:00 sourmash-4.6.1/src/core/src/sketch/minhash.rs
-rw-r--r--  0 501    20        383 Dec 19 14:00 sourmash-4.6.1/src/core/src/sketch/mod.rs
-rw-r--r--  0 501    20      32785 Dec 19 14:00 sourmash-4.6.1/src/core/src/sketch/nodegraph.rs
-rw-r--r--  0 501    20       8239 Dec 19 14:00 sourmash-4.6.1/src/core/src/storage.rs
-rw-r--r--  0 501    20       3189 Dec 19 14:00 sourmash-4.6.1/src/core/src/wasm.rs
-rw-r--r--  0 501    20          1 Dec 19 14:00 sourmash-4.6.1/src/core/tests/finch.rs
-rw-r--r--  0 501    20      27255 Dec 19 14:00 sourmash-4.6.1/src/core/tests/minhash.rs
-rw-r--r--  0 501    20       1231 Dec 19 14:00 sourmash-4.6.1/src/core/tests/storage.rs
-rw-r--r--  0 501    20        101 Dec 19 14:00 sourmash-4.6.1/src/core/tests/test.rs
-rw-r--r--  0 501    20       5037 Dec 19 14:00 sourmash-4.6.1/pyproject.toml
-rw-r--r--  0 501    20      38692 Dec 19 14:00 sourmash-4.6.1/src/core/Cargo.lock
-rw-r--r--  0 501    20       2360 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sbtmh.py
-rw-r--r--  0 501    20       3936 Dec 19 14:00 sourmash-4.6.1/src/sourmash/logging.py
-rw-r--r--  0 501    20      23748 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/lca_db.py
-rw-r--r--  0 501    20       3503 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/command_compare_csv.py
-rw-r--r--  0 501    20        453 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/__init__.py
-rw-r--r--  0 501    20       7527 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/lca_utils.py
-rw-r--r--  0 501    20       6511 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/command_summarize.py
-rw-r--r--  0 501    20      13094 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/command_index.py
-rw-r--r--  0 501    20       2381 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/command_rankinfo.py
-rw-r--r--  0 501    20       1055 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/__main__.py
-rw-r--r--  0 501    20       5489 Dec 19 14:00 sourmash-4.6.1/src/sourmash/lca/command_classify.py
-rw-r--r--  0 501    20       5436 Dec 19 14:00 sourmash-4.6.1/src/sourmash/nodegraph.py
-rw-r--r--  0 501    20      40015 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sourmash_args.py
-rw-r--r--  0 501    20      11294 Dec 19 14:00 sourmash-4.6.1/src/sourmash/manifest.py
-rw-r--r--  0 501    20       8964 Dec 19 14:00 sourmash-4.6.1/src/sourmash/picklist.py
-rw-r--r--  0 501    20         46 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sig/__init__.py
-rw-r--r--  0 501    20       4642 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sig/grep.py
-rw-r--r--  0 501    20      53326 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sig/__main__.py
-rw-r--r--  0 501    20       2404 Dec 19 14:00 sourmash-4.6.1/src/sourmash/fig.py
-rw-r--r--  0 501    20       4061 Dec 19 14:00 sourmash-4.6.1/src/sourmash/__init__.py
-rw-r--r--  0 501    20         27 Dec 19 14:00 sourmash-4.6.1/src/sourmash/tax/__init__.py
-rw-r--r--  0 501    20      46664 Dec 19 14:00 sourmash-4.6.1/src/sourmash/tax/tax_utils.py
-rw-r--r--  0 501    20      21601 Dec 19 14:00 sourmash-4.6.1/src/sourmash/tax/__main__.py
-rw-r--r--  0 501    20       5754 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/gather.py
-rw-r--r--  0 501    20       1786 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/plot.py
-rw-r--r--  0 501    20       2756 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/index.py
-rw-r--r--  0 501    20       2575 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/lca/index.py
-rw-r--r--  0 501    20       1389 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/lca/compare_csv.py
-rw-r--r--  0 501    20        719 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/lca/rankinfo.py
-rw-r--r--  0 501    20       1270 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/lca/classify.py
-rw-r--r--  0 501    20       1180 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/lca/__init__.py
-rw-r--r--  0 501    20       1463 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/lca/summarize.py
-rw-r--r--  0 501    20        487 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sbt_combine.py
-rw-r--r--  0 501    20       3834 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/kmers.py
-rw-r--r--  0 501    20       1636 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/describe.py
-rw-r--r--  0 501    20       2054 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/collect.py
-rw-r--r--  0 501    20        876 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/ingest.py
-rw-r--r--  0 501    20       1965 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/merge.py
-rw-r--r--  0 501    20       2001 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/downsample.py
-rw-r--r--  0 501    20       1699 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/flatten.py
-rw-r--r--  0 501    20       2391 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/check.py
-rw-r--r--  0 501    20       1609 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/subtract.py
-rw-r--r--  0 501    20       1589 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/manifest.py
-rw-r--r--  0 501    20       1672 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/rename.py
-rw-r--r--  0 501    20       1545 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/cat.py
-rw-r--r--  0 501    20        949 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/inflate.py
-rw-r--r--  0 501    20       1582 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/__init__.py
-rw-r--r--  0 501    20       3111 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/grep.py
-rw-r--r--  0 501    20       1021 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/export.py
-rw-r--r--  0 501    20       1832 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/intersect.py
-rw-r--r--  0 501    20       2238 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/split.py
-rw-r--r--  0 501    20       1432 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/overlap.py
-rw-r--r--  0 501    20       1815 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/filter.py
-rw-r--r--  0 501    20       2532 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/extract.py
-rw-r--r--  0 501    20       1249 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sig/fileinfo.py
-rw-r--r--  0 501    20        657 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/import_csv.py
-rw-r--r--  0 501    20       5015 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/__init__.py
-rw-r--r--  0 501    20       3883 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/metagenome.py
-rw-r--r--  0 501    20       1258 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/__init__.py
-rw-r--r--  0 501    20       2509 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/grep.py
-rw-r--r--  0 501    20       1715 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/summarize.py
-rw-r--r--  0 501    20       2489 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/annotate.py
-rw-r--r--  0 501    20       4616 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/genome.py
-rw-r--r--  0 501    20       2038 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/tax/prepare.py
-rw-r--r--  0 501    20        436 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/storage/convert.py
-rw-r--r--  0 501    20       1100 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/storage/__init__.py
-rw-r--r--  0 501    20       3117 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/multigather.py
-rw-r--r--  0 501    20       4800 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/utils.py
-rw-r--r--  0 501    20       4273 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/search.py
-rw-r--r--  0 501    20       2489 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/prefetch.py
-rw-r--r--  0 501    20       1174 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/watch.py
-rw-r--r--  0 501    20        834 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/info.py
-rw-r--r--  0 501    20       1159 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/categorize.py
-rw-r--r--  0 501    20        297 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/migrate.py
-rw-r--r--  0 501    20       3789 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/compare.py
-rw-r--r--  0 501    20       3232 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sketch/translate.py
-rw-r--r--  0 501    20       1244 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sketch/__init__.py
-rw-r--r--  0 501    20       2720 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sketch/fromfile.py
-rw-r--r--  0 501    20       3117 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sketch/dna.py
-rw-r--r--  0 501    20       3258 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/sketch/protein.py
-rw-r--r--  0 501    20       4711 Dec 19 14:00 sourmash-4.6.1/src/sourmash/cli/compute.py
-rw-r--r--  0 501    20       2070 Dec 19 14:00 sourmash-4.6.1/src/sourmash/utils.py
-rw-r--r--  0 501    20      22054 Dec 19 14:00 sourmash-4.6.1/src/sourmash/command_sketch.py
-rw-r--r--  0 501    20       9554 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sketchcomparison.py
-rw-r--r--  0 501    20      33557 Dec 19 14:00 sourmash-4.6.1/src/sourmash/search.py
-rw-r--r--  0 501    20       7820 Dec 19 14:00 sourmash-4.6.1/src/sourmash/index/revindex.py
-rw-r--r--  0 501    20      39560 Dec 19 14:00 sourmash-4.6.1/src/sourmash/index/sqlite_index.py
-rw-r--r--  0 501    20      41904 Dec 19 14:00 sourmash-4.6.1/src/sourmash/index/__init__.py
-rw-r--r--  0 501    20       1818 Dec 19 14:00 sourmash-4.6.1/src/sourmash/exceptions.py
-rw-r--r--  0 501    20      15561 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sbt_storage.py
-rw-r--r--  0 501    20       3765 Dec 19 14:00 sourmash-4.6.1/src/sourmash/hll.py
-rw-r--r--  0 501    20      14966 Dec 19 14:00 sourmash-4.6.1/src/sourmash/signature.py
-rw-r--r--  0 501    20      39268 Dec 19 14:00 sourmash-4.6.1/src/sourmash/minhash.py
-rw-r--r--  0 501    20      13464 Dec 19 14:00 sourmash-4.6.1/src/sourmash/distance_utils.py
-rw-r--r--  0 501    20        812 Dec 19 14:00 sourmash-4.6.1/src/sourmash/np_utils.py
-rw-r--r--  0 501    20      54363 Dec 19 14:00 sourmash-4.6.1/src/sourmash/commands.py
-rw-r--r--  0 501    20      13148 Dec 19 14:00 sourmash-4.6.1/src/sourmash/compare.py
-rw-r--r--  0 501    20        431 Dec 19 14:00 sourmash-4.6.1/src/sourmash/__main__.py
-rw-r--r--  0 501    20      17937 Dec 19 14:00 sourmash-4.6.1/src/sourmash/command_compute.py
-rw-r--r--  0 501    20      50279 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sbt.py
-rw-r--r--  0 501    20       2324 Dec 19 14:00 sourmash-4.6.1/src/sourmash/sqlite_utils.py
-rw-r--r--  0 501    20       5361 Dec 19 14:00 sourmash-4.6.1/README.md
-rw-r--r--  0 501    20      17582 Dec 19 14:00 sourmash-4.6.1/include/sourmash.h
-rw-r--r--  0 0      0        8524 Jan  1  1970 sourmash-4.6.1/PKG-INFO

You can see that sourmash-4.6.1/src/core/Cargo.lock is present in the sdist archive.

@messense
Copy link
Member Author

I've release 0.14.7b1 to pypi, you can give it try:

[build-system]
requires = ["maturin==0.14.7b1", "cffi"]
build-backend = 'maturin'

https://pypi.org/project/maturin/0.14.7b1/

@luizirber
Copy link
Contributor 

[build-system]
requires = ["maturin==0.14.7b1", "cffi"]
build-backend = 'maturin'

... and I don't even know how to build my own project properly 😓

I was updating the nix configurations, but tox doesn't use the maturin from there, it uses what is specified in pyproject.toml. When I changed it to what you suggested it all works (including nix run .#, which doesn't depend on PyPI as is pointing to this PR). Thanks!

I bumped maturin in nixpkgs recently, once 0.14.7 is release I'll bump it again (it does trigger a lot of CI jobs, so I'll skip 0.14.6)

@messense
Copy link
Member Author

@luizirber 0.14.7 is out: https://github.com/PyO3/maturin/releases/tag/v0.14.7

@luizirber
Copy link
Contributor

I bumped maturin in nixpkgs recently, once 0.14.7 is release I'll bump it again (it does trigger a lot of CI jobs, so I'll skip 0.14.6)

PR: NixOS/nixpkgs#207064

bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Dec 22, 2022
@bmwiedemann
Update python-maturin to version 0.14.7 / rev 22 via SR 1044089
1374f21 
https://build.opensuse.org/request/show/1044089
by user mia + dimstar_suse
- Update to v0.14.7:
  * Update uniffi_bindgen to 0.22.0
    gh#PyO3/maturin#1359
  * Add workspace lock file to sdist as a fallback
    gh#PyO3/maturin#1362
- Changes in v0.14.6:
  * Allow Rust crate to be placed outside of the directory
    containing pyproject.toml
    gh#PyO3/maturin#1347
  * Disallow uniffi bin bindings
    gh#PyO3/maturin#1353
  * Update bundled Python sysconfigs for Linux and macOS
    gh#PyO3/maturin#1355
@messense messense mentioned this pull request May 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
sdist Source distribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@messense @luizirber