diff --git a/Cargo.lock b/Cargo.lock index 30b39b2f93c1..0a8f9a19d170 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -305,6 +305,41 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if 1.0.0", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.30", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-signal" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1079d27511f6c038736279421774ef4ad4bdd2e300825f4a48c4cc463a57cedf" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.30", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + [[package]] name = "async-std" version = "1.12.0" @@ -315,6 +350,7 @@ dependencies = [ "async-global-executor", "async-io 1.13.0", "async-lock 2.8.0", + "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -1123,6 +1159,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener" version = "4.0.3" @@ -2955,6 +3002,7 @@ name = "puffin-extract" version = "0.0.1" dependencies = [ "async-compression", + "async-std", "async-tar", "async_zip", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 98fb25a72ccd..3eb72c42bb1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,6 +20,7 @@ license = "MIT OR Apache-2.0" anstream = { version = "0.6.5" } anyhow = { version = "1.0.79" } async-compression = { version = "0.4.6" } +async-std = {version = "1.6.0" } async-tar = { version = "0.4.2" } async_http_range_reader = { git = "https://github.com/baszalmstra/async_http_range_reader", rev = "8dab2c08ac864fec1df014465264f9a7c8eae905" } async_zip = { git = "https://github.com/charliermarsh/rs-async-zip", rev = "d76801da0943de985254fc6255c0e476b57c5836", features = ["deflate"] } diff --git a/crates/puffin-extract/Cargo.toml b/crates/puffin-extract/Cargo.toml index 3ad7c39e15da..214ba2679ab8 100644 --- a/crates/puffin-extract/Cargo.toml +++ b/crates/puffin-extract/Cargo.toml @@ -14,6 +14,8 @@ workspace = true [dependencies] async-compression = { workspace = true, features = ["gzip"] } +# See: https://github.com/dignifiedquire/async-tar/pull/35 +async-std = { workspace = true, features = ["unstable"] } async-tar = { workspace = true } async_zip = { workspace = true, features = ["tokio"] } flate2 = { workspace = true } diff --git a/requirements.in b/requirements.in deleted file mode 100644 index 89ab7baa398c..000000000000 --- a/requirements.in +++ /dev/null @@ -1,5 +0,0 @@ -#django @ https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269/Django-5.0.1.tar.gz -flask @ https://files.pythonhosted.org/packages/b2/14/97b9137a02f57d2287f3a9731b3a339fda716d2d3a157d7d1d89c2bebf7b/flask-3.0.1.tar.gz -markupsafe @ https://files.pythonhosted.org/packages/fb/5a/fb1326fe32913e663c8e2d6bdf7cde6f472e51f9c21f0768d9b9080fe7c5/MarkupSafe-2.1.4.tar.gz -requests @ https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3/requests-2.31.0.tar.gz -werkzeug @ https://files.pythonhosted.org/packages/0d/cc/ff1904eb5eb4b455e442834dabf9427331ac0fa02853bf83db817a7dd53d/werkzeug-3.0.1.tar.gz