Fix parsing version

astral-sh · Aug 1, 2023 · 58054f4 · 58054f4
1 parent 5912fd0
commit 58054f4
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/rye/src/pyproject.rs b/rye/src/pyproject.rs
@@ -745,17 +745,22 @@ impl PyProject {
 
     /// Returns the version.
     pub fn version(&mut self) -> Result<Version, Error> {
-        let mut version = self
-            .doc
-            .get("project")
-            .and_then(|x| x.get("version"))
-            .map(|x| x.to_string());
-        if let Some(dynamic) = self.dynamic() {
-            if dynamic.contains(&"version".to_string()) {
+        let read_version = || {
+            self.doc
+                .get("project")
+                .and_then(|x| x.get("version"))
+                .and_then(|x| x.as_str().map(String::from))
+        };
+
+        let version = match self.dynamic() {
+            Some(dynamic) if dynamic.contains(&"version".to_string()) => {
                 if let Ok(metadata) = get_project_metadata(&self.root_path()) {
-                    version = Some(metadata.version);
-                };
-            };
+                    Some(metadata.version)
+                } else {
+                    read_version()
+                }
+            }
+            _ => read_version(),
         };
 
         match version {