Backport changes from publish crates

Cargo.toml

@@ -69,7 +69,7 @@ plist = { version = "1.6.0" }
 pubgrub = { git = "https://github.com/zanieb/pubgrub", rev = "9b6d89cb8a0c7902815c8b2ae99106ba322ffb14" }
 pyo3 = { version = "0.20.2" }
 pyo3-log = { version = "0.9.0"}
-pyproject-toml = { version = "0.8.1" }
+pyproject-toml = { version = "0.10.0" }
 rand = { version = "0.8.5" }
 rayon = { version = "1.8.0" }
 reflink-copy = { version = "0.1.14" }

crates/pep440-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pep440_rs"
-version = "0.4.0"
+version = "0.5.0"
 description = "A library for python version numbers and specifiers, implementing PEP 440"
 license = "Apache-2.0 OR BSD-2-Clause"
 include = ["/src", "Changelog.md", "License-Apache", "License-BSD", "Readme.md", "pyproject.toml"]

crates/pep440-rs/Readme.md

@@ -16,7 +16,7 @@ let version = Version::from_str("1.19").unwrap();
 let version_specifier = VersionSpecifier::from_str("==1.*").unwrap();
 assert!(version_specifier.contains(&version));
 let version_specifiers = parse_version_specifiers(">=1.16, <2.0").unwrap();
-assert!(version_specifiers.iter().all(|specifier| specifier.contains(&version)));
+assert!(version_specifiers.contains(&version));
 ```
 
 In python (`pip install pep440_rs`):

crates/pep440-rs/src/lib.rs

@@ -9,7 +9,7 @@
 //! let version_specifier = VersionSpecifier::from_str("== 1.*").unwrap();
 //! assert!(version_specifier.contains(&version));
 //! let version_specifiers = VersionSpecifiers::from_str(">=1.16, <2.0").unwrap();
-//! assert!(version_specifiers.iter().all(|specifier| specifier.contains(&version)));
+//! assert!(version_specifiers.contains(&version));
 //! ```
 //!
 //! PEP 440 has a lot of unintuitive features, including:
@@ -41,9 +41,7 @@ pub use {
         LocalSegment, Operator, OperatorParseError, PreRelease, PreReleaseKind, Version,
         VersionParseError, VersionPattern, VersionPatternParseError, MIN_VERSION,
     },
-    version_specifier::{
-        parse_version_specifiers, VersionSpecifier, VersionSpecifiers, VersionSpecifiersParseError,
-    },
+    version_specifier::{VersionSpecifier, VersionSpecifiers, VersionSpecifiersParseError},
 };
 
 mod version;

crates/pep440-rs/src/version.rs

@@ -2291,7 +2291,7 @@ fn parse_u64(bytes: &[u8]) -> Result<u64, VersionParseError> {
     Ok(n)
 }
 
-/// The minimum version that can be represented by a [`Version`].
+/// The minimum version that can be represented by a [`Version`]: `0a0.dev0`.
 pub static MIN_VERSION: once_cell::sync::Lazy<Version> =
     once_cell::sync::Lazy::new(|| Version::from_str("0a0.dev0").unwrap());
 

crates/pep440-rs/src/version_specifier.rs

@@ -697,19 +697,8 @@ impl From<ParseErrorKind> for VersionSpecifierParseError {
     }
 }
 
-/// Parses a list of specifiers such as `>= 1.0, != 1.3.*, < 2.0`.
-///
-/// I recommend using [`VersionSpecifiers::from_str`] instead.
-///
-/// ```rust
-/// use std::str::FromStr;
-/// use pep440_rs::{parse_version_specifiers, Version};
-///
-/// let version = Version::from_str("1.19").unwrap();
-/// let version_specifiers = parse_version_specifiers(">=1.16, <2.0").unwrap();
-/// assert!(version_specifiers.iter().all(|specifier| specifier.contains(&version)));
-/// ```
-pub fn parse_version_specifiers(
+/// Parse a list of specifiers such as `>= 1.0, != 1.3.*, < 2.0`.
+pub(crate) fn parse_version_specifiers(
     spec: &str,
 ) -> Result<Vec<VersionSpecifier>, VersionSpecifiersParseError> {
     let mut version_ranges = Vec::new();

crates/pep508-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pep508_rs"
-version = "0.2.3"
+version = "0.4.2"
 description = "A library for python dependency specifiers, better known as PEP 508"
 include = ["/src", "Changelog.md", "License-Apache", "License-BSD", "Readme.md", "pyproject.toml"]
 license = "Apache-2.0 OR BSD-2-Clause"
@@ -30,9 +30,9 @@ rkyv = { workspace = true, features = ["strict"], optional = true }
 serde = { workspace = true, features = ["derive"], optional = true }
 serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
-tracing = { workspace = true, features = ["log"] }
+tracing = { workspace = true, optional = true }
 unicode-width = { workspace = true }
-url = { workspace = true, features = ["serde"] }
+url = { workspace = true }
 
 [dev-dependencies]
 indoc = { version = "2.0.4" }
@@ -41,7 +41,15 @@ serde_json = { version = "1.0.111" }
 testing_logger = { version = "0.1.1" }
 
 [features]
-pyo3 = ["dep:pyo3", "pep440_rs/pyo3", "pyo3-log"]
-rkyv = ["dep:rkyv", "pep440_rs/rkyv"]
-serde = ["dep:serde", "pep440_rs/serde"]
+pyo3 = ["dep:pyo3", "pep440_rs/pyo3", "pyo3-log", "tracing", "tracing/log"]
+rkyv = ["dep:rkyv", "pep440_rs/rkyv", "uv-normalize/rkyv"]
+serde = ["dep:serde", "pep440_rs/serde", "uv-normalize/serde", "url/serde"]
+tracing = ["dep:tracing", "pep440_rs/tracing"]
+# PEP 508 allows only URLs such as `foo @ https://example.org/foo` or `foo @ file:///home/ferris/foo`, and
+# arguably does not allow relative paths in file URLs (`foo @ file://./foo`,
+# `foo @ file:foo-3.0.0-py3-none-any.whl`, `foo @ file://foo-3.0.0-py3-none-any.whl`), as they are not part of the
+# relevant RFCs, even though widely supported. Pip accepts relative file URLs and paths instead of urls
+# (`foo @ ./foo-3.0.0-py3-none-any.whl`). The `non-pep508-features` controls whether these non-spec features will
+# be supported.
+non-pep508-extensions = []
 default = []