Merge pull request #1585 from messense/update-pyproject-toml

Update pyproject-toml to 0.6.0
PyO3 · May 2, 2023 · de44b26 · de44b26
2 parents 67dbe8b + e4bb66e
commit de44b26
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,7 +48,7 @@ rustc_version = "0.4.0"
 semver = "1.0.13"
 target-lexicon = "0.12.0"
 indexmap = "1.9.3"
-pyproject-toml = "0.5.2"
+pyproject-toml = "0.6.0"
 python-pkginfo = "0.5.5"
 textwrap = "0.16.0"
 ignore = "0.4.20"

diff --git a/src/metadata.rs b/src/metadata.rs
@@ -4,6 +4,7 @@ use fs_err as fs;
 use indexmap::IndexMap;
 use pep440_rs::{Version, VersionSpecifiers};
 use pep508_rs::{MarkerExpression, MarkerOperator, MarkerTree, MarkerValue, Requirement};
+use pyproject_toml::License;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -180,16 +181,21 @@ impl Metadata21 {
                 self.requires_python = Some(requires_python.clone());
             }
 
-            if let Some(pyproject_toml::License { file, text }) = &project.license {
-                if file.is_some() && text.is_some() {
-                    bail!("file and text fields of 'project.license' are mutually-exclusive, only one of them should be specified");
-                }
-                if let Some(license_path) = file {
-                    let license_path = pyproject_dir.join(license_path);
-                    self.license_files.push(license_path);
-                }
-                if let Some(license_text) = text {
-                    self.license = Some(license_text.clone());
+            if let Some(license) = &project.license {
+                match license {
+                    // TODO: switch to License-Expression core metadata, see https://peps.python.org/pep-0639/#add-license-expression-field
+                    License::String(license_expr) => self.license = Some(license_expr.clone()),
+                    License::Table { file, text } => match (file, text) {
+                        (Some(_), Some(_)) => {
+                            bail!("file and text fields of 'project.license' are mutually-exclusive, only one of them should be specified");
+                        }
+                        (Some(license_path), None) => {
+                            let license_path = pyproject_dir.join(license_path);
+                            self.license_files.push(license_path);
+                        }
+                        (None, Some(license_text)) => self.license = Some(license_text.clone()),
+                        (None, None) => {}
+                    },
                 }
             }
 

diff --git a/src/source_distribution.rs b/src/source_distribution.rs
@@ -738,7 +738,7 @@ pub fn source_distribution(
         if let Some(pyproject_toml::ReadMe::RelativePath(readme)) = project.readme.as_ref() {
             writer.add_file(root_dir.join(readme), pyproject_dir.join(readme))?;
         }
-        if let Some(pyproject_toml::License {
+        if let Some(pyproject_toml::License::Table {
             file: Some(license),
             text: None,
         }) = project.license.as_ref()