Add monotrail-utils crate #53

cnpryer · 2023-06-06T21:50:13Z

UPDATED:

This PR moves RequirementsTxt to a new monotrail-utils crate.

Summary of changes:

Add monotrail-utils crate
Move RequirementsTxt over
Use RequirementsTxt in poetry_integration

Tag astral-sh/rye#265
Closes #56

Does not include poetry integration

konstin · 2023-06-07T12:43:09Z

monotrail-utils/Cargo.toml

+[dependencies]
+anyhow = "1.0.65"
+fs-err = "2.8.1"
+pep508_rs = { git = "https://github.com/konstin/pep508_rs", rev = "df87d4ff0f0f3554780ab82680539cb190b0a585", features = ["serde"] }


Can this use a released version?

Added in d64b333

konstin · 2023-06-07T12:44:30Z

monotrail-utils/src/lib.rs

@@ -0,0 +1,3 @@
+pub use requirements_txt::RequirementsTxt;


This should get some module level (or rather crate level) doc comment about what this crate is

Do we want to hold off on fleshing it out? Added in 97987ad

konstin · 2023-06-07T12:48:18Z

Move the poetry integration usage into monotrail-utils

Could you use the monotrail_util RequirementsTxt in the poetry integration?

We also need updated CI workflows to publish monotrail-utils to crates.io, not necessarily now but before it blocks downstream crates from publishing to crates.io

cnpryer · 2023-06-07T13:22:35Z

Could you use the monotrail_util RequirementsTxt in the poetry integration?

I'll check it out.

This was removed accidentally in konstin#53

cnpryer · 2023-06-08T01:15:44Z

I can look into making a PR for the CI after if that's alright with you.

I'm planning on getting astral-sh/rye#265 ready for a review next. Then I can loop around to the CI.

cnpryer · 2023-06-08T14:54:11Z

src/monotrail.rs

-    let requirements = RequirementsTxt::parse(&requirements_txt, &current_dir()?)?
-        .into_poetry(&requirements_txt)?;
+    let requirements = read_requirements_for_poetry(&requirements_txt, &current_dir()?)?;


I believe I'm adding an allocation here.

tbh i'm not to concerned about allocations here, i don't think requirements.txt parsing will take any noticeable amount of time, especially when compared to network requests, deserialization and package installation (those three i've seen as bottlenecks in flamegraphs)

konstin

cargo test --workspace and cargo clippy --tests --all-features --workspace are still failing, otherwise looks good

konstin · 2023-06-10T15:56:35Z

monotrail-utils/Cargo.toml

+anyhow = "1.0.65"
+fs-err = "2.8.1"
+pep508_rs = { version = "0.2.1", features = ["serde"] }
+serde = { version = "1.0.145", features = ["derive"] }
+serde_json = "1.0.85"
+toml = "0.7.2"
+tracing = "0.1.36"
+unscanny = "0.1.0"


Here we can inherit the versions for the shared dependencies from the workspace root: https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table

Would you like to use shared deps in install-wheel-rs? I can make that a follow up PR if you want.

that's be great!

I couldn't find anything about dev deps. Started with 175f7b3. Done

IIUC I'd want to use [workspace.dependencies] for dev dependencies as well. Added in ee7a182

cnpryer · 2023-06-10T16:30:54Z

I have the same 12 pass 1 failure (wheel::test::installed_paths_relative) on main for cargo test --workspace. I'll look again later.

UPDATE: #56

Does not include dev deps

cnpryer · 2023-06-10T21:25:28Z

I can create an issue for this, but on main cargo test --release results with

failures:
    test_flipstring
    test_pipx_black_version
    test_poetry_config
    test_srcery

I'm on macos.

UPDATE: #55

monotrail-utils/src/requirements_txt.rs

Closes konstin#56

konstin · 2023-06-12T18:21:41Z

Thanks!

cnpryer added 2 commits June 6, 2023 12:04

Add empty monotrail-utils crate

08296cd

Add requirements_txt module to monotrail-utils

d23ff81

Does not include poetry integration

konstin reviewed Jun 7, 2023

View reviewed changes

cnpryer added 3 commits June 7, 2023 13:18

Use pep508_rs v0.2.1

d64b333

Add crate doc comment to monotrail-utils

97987ad

Start with monotrail-utils v0.0.1

74853ff

cnpryer marked this pull request as draft June 7, 2023 17:54

cnpryer added 5 commits June 7, 2023 16:53

Use pep508_rs v0.2.1 in monotrail

cee49b5

Use RequirementsTxt in poetry_integration

5cb1e07

Add Cargo.toml profile config ('zip implementation') back

3ee53b0

This was removed accidentally in konstin#53

Collapse import statements

06aaba0

Small chore

9c804ba

cnpryer marked this pull request as ready for review June 7, 2023 21:44

cnpryer commented Jun 8, 2023

View reviewed changes

cnpryer mentioned this pull request Jun 8, 2023

Add basic metadata importing to init command astral-sh/rye#265

Merged

5 tasks

konstin reviewed Jun 10, 2023

View reviewed changes

Cargo clippy --fix

a71d8d9

cnpryer added 5 commits June 10, 2023 12:36

Use shared workspace dependencies

175f7b3

Does not include dev deps

Use shared dependencies from install-wheel-rs

9880144

Bump install-wheel-rs thiserror to v1.0.37

67bcc23

Bump install-wheel-rs sha2 to v0.10.6

b9d93ea

Bump install-wheel-rs serde to v1.0.145

a0cad01

cnpryer marked this pull request as draft June 10, 2023 17:09

Use shared dev dependencies

ee7a182

cnpryer force-pushed the monotrail-utils branch from bf80cd1 to 2a40114 Compare June 10, 2023 21:41

cnpryer commented Jun 10, 2023

View reviewed changes

monotrail-utils/src/requirements_txt.rs Outdated Show resolved Hide resolved

cnpryer force-pushed the monotrail-utils branch from 2a40114 to 4c82784 Compare June 10, 2023 21:47

Fix requirements_txt tests

938ce41

cnpryer force-pushed the monotrail-utils branch from 4c82784 to 938ce41 Compare June 10, 2023 21:49

cnpryer marked this pull request as ready for review June 10, 2023 22:01

cnpryer mentioned this pull request Jun 11, 2023

requirements_txt::test::test_empty_file fails on MacOS #56

Closed

Fix logtest issue on macos

e6526ad

Closes konstin#56

konstin merged commit 596c51e into konstin:main Jun 12, 2023

cnpryer deleted the monotrail-utils branch June 12, 2023 19:09

cnpryer mentioned this pull request Jun 13, 2023

Release CI for crates #59

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add monotrail-utils crate #53

Add monotrail-utils crate #53

cnpryer commented Jun 6, 2023 •

edited

Loading

konstin Jun 7, 2023

cnpryer Jun 7, 2023

konstin Jun 7, 2023

cnpryer Jun 7, 2023

konstin commented Jun 7, 2023

cnpryer commented Jun 7, 2023

cnpryer commented Jun 8, 2023

cnpryer Jun 8, 2023

konstin Jun 8, 2023

konstin left a comment

konstin Jun 10, 2023

cnpryer Jun 10, 2023

konstin Jun 10, 2023

cnpryer Jun 10, 2023 •

edited

Loading

cnpryer Jun 10, 2023

cnpryer commented Jun 10, 2023 •

edited

Loading

cnpryer commented Jun 10, 2023 •

edited

Loading

konstin commented Jun 12, 2023

Add monotrail-utils crate #53

Add monotrail-utils crate #53

Conversation

cnpryer commented Jun 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

konstin commented Jun 7, 2023

cnpryer commented Jun 7, 2023

cnpryer commented Jun 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

konstin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cnpryer Jun 10, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cnpryer commented Jun 10, 2023 • edited Loading

cnpryer commented Jun 10, 2023 • edited Loading

konstin commented Jun 12, 2023

cnpryer commented Jun 6, 2023 •

edited

Loading

cnpryer Jun 10, 2023 •

edited

Loading

cnpryer commented Jun 10, 2023 •

edited

Loading

cnpryer commented Jun 10, 2023 •

edited

Loading