Skip to content

improve generate_crate_list + parsing of crates in Cargo easyblock#3084

Merged
branfosj merged 2 commits intoeasybuilders:developfrom
Flamefire:improve_cargo
Jan 20, 2024
Merged

improve generate_crate_list + parsing of crates in Cargo easyblock#3084
branfosj merged 2 commits intoeasybuilders:developfrom
Flamefire:improve_cargo

Conversation

@Flamefire
Copy link
Copy Markdown
Contributor

@Flamefire Flamefire commented Jan 19, 2024

In generate_crate_list:

This now also handles lines found in polar such as source = "git+https://github.com/ritchie46/jsonpath?branch=improve_compiled#24eaf0b4416edff38a4d1b6b17bc4b9f3f047b4b"

Also fix the parsing of those 4-tuples (crate, version, repo, rev) which removed parts of the
reponame as it expected a .git extension which is not always present.
Also the source_urls parameter is redundant as it won't be used.

- Handle missing package name by using folder name
- Fix handling of source with revision -> Output 4-tuple
Handling of 4-tuples `(crate, version, repo, rev)` removed parts of the
reponame as it expected a `.git` extension which is not always present.
Also the `source_urls` parameter is redundant as it won't be used.
Copy link
Copy Markdown
Contributor

@Micket Micket left a comment

Choose a reason for hiding this comment

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

lgtm

@Micket Micket added the bug fix label Jan 19, 2024
@Micket Micket added this to the release after 4.9.0 milestone Jan 19, 2024
@boegel boegel changed the title improve cargo enerate_crate_list and parsing of crates improve generate_crate_list + parsing of crates in Cargo easyblock Jan 19, 2024
@branfosj
Copy link
Copy Markdown
Member

Test report by @branfosj

Overview of tested easyconfigs (in order)

  • SUCCESS bcrypt-4.0.1-GCCcore-12.3.0.eb
  • SUCCESS cryptography-41.0.1-GCCcore-12.3.0.eb
  • SUCCESS cryptography-41.0.5-GCCcore-13.2.0.eb
  • SUCCESS fastparquet-2023.4.0-gfbf-2022b.eb
  • SUCCESS maturin-1.1.0-GCCcore-12.2.0.eb
  • SUCCESS maturin-1.1.0-GCCcore-12.3.0.eb
  • SUCCESS maturin-1.3.1-GCCcore-13.2.0.eb
  • SUCCESS rustworkx-0.12.1-foss-2022a.eb
  • SUCCESS timm-0.6.13-foss-2022a-CUDA-11.7.0.eb
  • SUCCESS tokenizers-0.13.3-GCCcore-12.2.0.eb
  • SUCCESS Rust-1.75.0-GCCcore-12.2.0.eb
  • SUCCESS maturin-1.4.0-GCCcore-12.2.0-Rust-1.75.0.eb
  • SUCCESS typing-extensions-4.9.0-GCCcore-12.2.0.eb
  • SUCCESS pydantic-2.5.3-GCCcore-12.2.0.eb

Build succeeded for 14 out of 14 (12 easyconfigs in total)
bear-pg0105u03a - Linux RHEL 8.6, x86_64, Intel(R) Xeon(R) Platinum 8360Y CPU @ 2.40GHz (icelake), Python 3.6.8
See https://gist.github.com/branfosj/a7f5cd2e466244b44b88fecb3a9e78bf for a full test report.

@branfosj
Copy link
Copy Markdown
Member

Going in, thanks @Flamefire!

@branfosj branfosj merged commit c9f4bb9 into easybuilders:develop Jan 20, 2024
@Flamefire Flamefire deleted the improve_cargo branch January 20, 2024 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants