maturin 1.7.2__tar.gz → 1.7.3__tar.gz

{maturin-1.7.2 → maturin-1.7.3}/Cargo.lock

@@ -1200,7 +1200,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.7.2"
+version = "1.7.3"
 dependencies = [
  "anyhow",
  "base64 0.21.7",

{maturin-1.7.2 → maturin-1.7.3}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.7.2"
+version = "1.7.3"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",

{maturin-1.7.2 → maturin-1.7.3}/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.7.3]
+
+* Fix upload regression to pypi/testpypi in [#2229](https://github.com/PyO3/maturin/pull/2229)
+
 ## [1.7.2]
 
 * Fix cross compilation issues for armv7l, mips64 and ppc in [#2204](https://github.com/PyO3/maturin/pull/2204)
@@ -983,7 +987,8 @@ points-0.1.0-py2.py3-none-manylinux1_x86_64.whl | 2,8M | 752K | 85K
 
  * Initial Release
 
-[Unreleased]: https://github.com/pyo3/maturin/compare/v1.7.2...HEAD
+[Unreleased]: https://github.com/pyo3/maturin/compare/v1.7.3...HEAD
+[1.7.3]: https://github.com/pyo3/maturin/compare/v1.7.2...v1.7.3
 [1.7.2]: https://github.com/pyo3/maturin/compare/v1.7.1...v1.7.2
 [1.7.1]: https://github.com/pyo3/maturin/compare/v1.7.0...v1.7.1
 [1.7.0]: https://github.com/pyo3/maturin/compare/v1.6.0...v1.7.0

{maturin-1.7.2 → maturin-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maturin
-Version: 1.7.2
+Version: 1.7.3
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython

{maturin-1.7.2 → maturin-1.7.3}/src/upload.rs

@@ -59,6 +59,7 @@ pub struct PublishOpt {
 }
 
 impl PublishOpt {
+    // Here we omit trailing slashes from the repository URL, which we'll add back in `complete_registry`
     const DEFAULT_REPOSITORY_URL: &'static str = "https://upload.pypi.org/legacy";
     const TEST_REPOSITORY_URL: &'static str = "https://test.pypi.org/legacy";
 
@@ -317,20 +318,32 @@ fn complete_registry(opt: &PublishOpt) -> Result<Registry> {
     let (registry_name, registry_url) = if let Some(repository_url) = opt.repository_url.as_deref()
     {
         // to normalize URLs by removing trailing slashes
-        let name = match repository_url.trim_end_matches('/') {
-            PublishOpt::DEFAULT_REPOSITORY_URL => Some("pypi"),
-            PublishOpt::TEST_REPOSITORY_URL => Some("testpypi"),
-            _ => None,
-        };
-        (name, repository_url.to_string())
+        match repository_url.trim_end_matches('/') {
+            PublishOpt::DEFAULT_REPOSITORY_URL => (
+                Some("pypi"),
+                // Add trailing slash back
+                format!("{}/", PublishOpt::DEFAULT_REPOSITORY_URL),
+            ),
+            PublishOpt::TEST_REPOSITORY_URL => (
+                Some("testpypi"),
+                // Add trailing slash back
+                format!("{}/", PublishOpt::TEST_REPOSITORY_URL),
+            ),
+            _ => (None, repository_url.to_string()),
+        }
     } else if let Some(url) = pypirc.get(&opt.repository, "repository") {
         (Some(opt.repository.as_str()), url)
     } else if opt.repository == "pypi" {
-        (Some("pypi"), PublishOpt::DEFAULT_REPOSITORY_URL.to_string())
+        (
+            Some("pypi"),
+            // Add trailing slash back
+            format!("{}/", PublishOpt::DEFAULT_REPOSITORY_URL),
+        )
     } else if opt.repository == "testpypi" {
         (
             Some("testpypi"),
-            PublishOpt::TEST_REPOSITORY_URL.to_string(),
+            // Add trailing slash back
+            format!("{}/", PublishOpt::TEST_REPOSITORY_URL),
         )
     } else {
         bail!(