Add network proxy support to upload command

Cargo.toml

@@ -65,7 +65,7 @@ clap_complete_fig = "3.1.0"
 configparser = { version = "3.0.0", optional = true }
 multipart = { version = "0.18.0", features = ["client"], default-features = false, optional = true }
 rpassword = { version = "6.0.1", optional = true }
-ureq = { version = "2.3.1", features = ["gzip"], default-features = false, optional = true }
+ureq = { version = "2.3.1", features = ["gzip", "socks-proxy"], default-features = false, optional = true }
 native-tls-crate = { package = "native-tls", version = "0.2.8", optional = true }
 tracing = "0.1.34"
 

Changelog.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fix abi3 wheel build issue when no Python interpreters found on host in [#933](https://github.com/PyO3/maturin/pull/933)
 * Add Python 3.11 sysconfigs for Linux, macOS and Windows in [#934](https://github.com/PyO3/maturin/pull/934)
 * Add Python 3.11 sysconfig for arm64 Windows in [#936](https://github.com/PyO3/maturin/pull/936)
+* Add network proxy support to upload command in [#939](https://github.com/PyO3/maturin/pull/939)
 
 ## [0.12.17] - 2022-05-18
 

src/upload.rs

@@ -317,15 +317,31 @@ pub fn upload(registry: &Registry, wheel_path: &Path) -> Result<(), UploadError>
 
     let encoded = base64::encode(&format!("{}:{}", registry.username, registry.password));
 
+    let http_proxy = env::var("HTTPS_PROXY")
+        .or_else(|_| env::var("https_proxy"))
+        .or_else(|_| env::var("HTTP_PROXY"))
+        .or_else(|_| env::var("http_proxy"));
+
     #[cfg(not(feature = "native-tls"))]
-    let agent = ureq::agent();
+    let agent = {
+        let mut builder = ureq::builder();
+        if let Ok(proxy) = http_proxy {
+            let proxy = ureq::Proxy::new(proxy)?;
+            builder = builder.proxy(proxy);
+        };
+        builder.build()
+    };
 
     #[cfg(feature = "native-tls")]
     let agent = {
         use std::sync::Arc;
-        ureq::builder()
-            .tls_connector(Arc::new(native_tls_crate::TlsConnector::new()?))
-            .build()
+        let mut builder =
+            ureq::builder().tls_connector(Arc::new(native_tls_crate::TlsConnector::new()?));
+        if let Ok(proxy) = http_proxy {
+            let proxy = ureq::Proxy::new(proxy)?;
+            builder = builder.proxy(proxy);
+        };
+        builder.build()
     };
 
     let response = agent