Merge branch 'main' into feat/pep658

.github/workflows/rust-compile.yml

@@ -14,7 +14,6 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   CARGO_TERM_COLOR: always
-  DEFAULT_FEATURES:
 
 jobs:
   check-rustdoc-links:
@@ -105,7 +104,6 @@ jobs:
         run: >
           cargo build 
           --all-targets  
-          --features ${{ env.DEFAULT_FEATURES }}
           ${{ steps.build-options.outputs.CARGO_BUILD_OPTIONS}}
 
       - name: Disable testing the tools crate if cross compiling
@@ -119,7 +117,6 @@ jobs:
         run: >
           cargo test 
           --workspace 
-          --features ${{ env.DEFAULT_FEATURES }} 
           ${{ steps.build-options.outputs.CARGO_BUILD_OPTIONS}} 
           ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}} 
           -- 

crates/index/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "index"
+authors = ["Tim de Jager <[email protected]>"]
+version.workspace = true
+categories.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
+readme.workspace = true
+rust-version.workspace = true
+
+[features]
+default = ["native-tls"]
+native-tls = ['rattler_installs_packages/native-tls', 'rip/native-tls']
+rustls-tls = ['rattler_installs_packages/rustls-tls', 'rip/rustls-tls']
+
+[dependencies]
+clap = { version = "4.4.5", features = ["derive"] }
+dirs = "5.0.1"
+indexmap = "2.0.0"
+indicatif = "0.17.7"
+miette = { version = "5.10.0", features = ["fancy"] }
+rand = "0.8.5"
+rattler_installs_packages = { path = "../rattler_installs_packages", default-features = false }
+rip = { path = "../rip", default-features = false }
+rusqlite = { version = "0.29.0", features = ["bundled"] }
+serde_json = "1.0.107"
+tokio = { version = "1.32.0", features = ["rt", "macros", "rt-multi-thread"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+url = "2.4.1"
+
+
+[package.metadata.release]
+# Dont publish the binary
+release = false

crates/rip/src/bin/index.rs → crates/index/src/main.rs

@@ -20,7 +20,7 @@ use rip::writer::{global_multi_progress, IndicatifWriter};
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 struct Args {
-    /// Base URL of the Python Package Index (default https://pypi.org/simple). This should point
+    /// Base URL of the Python Package Index (default <https://pypi.org/simple>). This should point
     /// to a repository compliant with PEP 503 (the simple repository API).
     #[clap(default_value = "https://pypi.org/simple/", long)]
     index_url: Url,

crates/rattler_installs_packages/Cargo.toml

@@ -11,47 +11,51 @@ license.workspace = true
 readme.workspace = true
 rust-version.workspace = true
 
+[features]
+default = ["native-tls"]
+native-tls = ['reqwest/native-tls']
+rustls-tls = ['reqwest/rustls-tls']
+
 [dependencies]
-async-trait = "0.1.71"
-bytes = "1.4.0"
+async-trait = "0.1.73"
+bytes = "1.5.0"
 ciborium = "0.2.1"
 data-encoding = "2.4.0"
-elsa = "1.8.1"
+elsa = "1.9.0"
 fs4 = "0.6.6"
 futures = "0.3.28"
 http = "0.2.9"
 http-cache-semantics = { version = "1.0.1", default-features = false, features = ["with_serde", "reqwest"] }
 indexmap = "2.0.0"
-miette = "5.9.0"
+miette = "5.10.0"
 mime = "0.3.17"
 once_cell = "1.18.0"
 parking_lot = "0.12.1"
 peg = "0.8.1"
 pep440 = "0.2.0"
-pin-project-lite = "0.2.10"
-rattler_digest = { version = "0.6.0", features = ["serde"] }
-regex = "1.9.1"
-reqwest = { version = "0.11.18", features = ["json", "stream"] }
+pin-project-lite = "0.2.13"
+rattler_digest = { version = "0.9.0", features = ["serde"] }
+regex = "1.9.5"
+reqwest = { version = "0.11.20", default-features = false, features = ["json", "stream"] }
 serde = "1.0.188"
-serde_json = "1.0.100"
-serde_with = "3.0.0"
-smallvec = { version = "1.11.0", features = ["const_generics", "const_new"] }
-tempfile = "3.6.0"
-thiserror = "1.0.43"
-tokio = { version = "1.29.1" }
-tokio-util = { version = "0.7.8", features = ["compat"] }
+serde_json = "1.0.107"
+serde_with = "3.3.0"
+smallvec = { version = "1.11.1", features = ["const_generics", "const_new"] }
+tempfile = "3.8.0"
+thiserror = "1.0.48"
+tl = "0.7.7"
+tokio = { version = "1.32.0" }
+tokio-util = { version = "0.7.9", features = ["compat"] }
 tracing = { version = "0.1.37", default-features = false, features = ["attributes"] }
-url = { version = "2.4.0", features = ["serde"] }
+url = { version = "2.4.1", features = ["serde"] }
 zip = "0.6.6"
-tl = "0.7.7"
-
 
 [dev-dependencies]
-tokio = { version = "1.29.1", features = ["rt", "macros"] }
-miette = { version = "5.9.0", features = ["fancy"] }
-insta = { version = "1.30.0", features = ["ron"] }
-once_cell = "1.18.0"
 criterion = "0.3"
+insta = { version = "1.32.0", features = ["ron"] }
+miette = { version = "5.10.0", features = ["fancy"] }
+once_cell = "1.18.0"
+tokio = { version = "1.32.0", features = ["rt", "macros"] }
 
 [[bench]]
 name = "html"