Merge pull request #404 from sanders41/tomli

Only include tomli if min version is < 3.12

Author: sanders41

src/main.rs

@@ -8,6 +8,7 @@ mod project_generator;
 mod project_info;
 mod python_files;
 mod rust_files;
+mod utils;
 
 use std::fs::remove_dir_all;
 use std::process::exit;

src/package_version.rs

@@ -100,7 +100,6 @@ impl LatestVersion for PythonPackageVersion {
     fn get_latest_version(&mut self) -> Result<()> {
         let name = self.package.to_string();
         let url = format!("https://pypi.org/pypi/{}/json", name);
-        println!("{url}");
         let client = reqwest::blocking::Client::new();
         let response = client
             .get(url)

src/project_generator.rs

@@ -17,6 +17,7 @@ use crate::package_version::{
 use crate::project_info::{ProjectInfo, ProjectManager};
 use crate::python_files::generate_python_files;
 use crate::rust_files::{save_cargo_toml_file, save_lib_file};
+use crate::utils::is_python_312_or_greater;
 
 fn create_directories(project_info: &ProjectInfo) -> Result<()> {
     let module = project_info.source_dir.replace([' ', '-'], "_");
@@ -268,7 +269,8 @@ fn save_pre_commit_file(project_info: &ProjectInfo) -> Result<()> {
 fn build_latest_dev_dependencies(
     download_latest_packages: bool,
     project_manager: &ProjectManager,
-) -> String {
+    min_python_version: &str,
+) -> Result<String> {
     let mut version_string = String::new();
     let mut packages = vec![
         PythonPackageVersion::new(PythonPackage::MyPy),
@@ -278,11 +280,17 @@ fn build_latest_dev_dependencies(
         PythonPackageVersion::new(PythonPackage::Ruff),
     ];
 
-    match project_manager {
-        ProjectManager::Maturin => packages.push(PythonPackageVersion::new(PythonPackage::Maturin)),
-        ProjectManager::Poetry => packages.push(PythonPackageVersion::new(PythonPackage::Tomli)),
-        ProjectManager::Setuptools => (),
-    };
+    if !is_python_312_or_greater(min_python_version)? {
+        match project_manager {
+            ProjectManager::Maturin => {
+                packages.push(PythonPackageVersion::new(PythonPackage::Maturin))
+            }
+            ProjectManager::Poetry => {
+                packages.push(PythonPackageVersion::new(PythonPackage::Tomli))
+            }
+            ProjectManager::Setuptools => (),
+        };
+    }
 
     if download_latest_packages {
         packages.par_iter_mut().for_each(|package| {
@@ -313,14 +321,14 @@ fn build_latest_dev_dependencies(
     }
 
     if let ProjectManager::Poetry = project_manager {
-        version_string.trim().to_string()
+        Ok(version_string.trim().to_string())
     } else {
         version_string.push_str("-e .\n");
-        version_string
+        Ok(version_string)
     }
 }
 
-fn create_pyproject_toml(project_info: &ProjectInfo) -> String {
+fn create_pyproject_toml(project_info: &ProjectInfo) -> Result<String> {
     let module = project_info.source_dir.replace([' ', '-'], "_");
     let pyupgrade_version = &project_info.min_python_version.replace(['.', '^'], "");
     let license_text = license_str(&project_info.license);
@@ -442,7 +450,7 @@ ignore=[
 "#,
     );
 
-    render!(
+    Ok(render!(
         &pyproject,
         project_name => module.replace('_', "-"),
         version => project_info.version,
@@ -451,17 +459,17 @@ ignore=[
         creator_email => project_info.creator_email,
         license => license_text,
         min_python_version => project_info.min_python_version,
-        dev_dependencies => build_latest_dev_dependencies(project_info.download_latest_packages, &project_info.project_manager),
+        dev_dependencies => build_latest_dev_dependencies(project_info.download_latest_packages, &project_info.project_manager, &project_info.min_python_version)?,
         max_line_length => project_info.max_line_length,
         module => module,
         is_application => project_info.is_application,
         pyupgrade_version => pyupgrade_version,
-    )
+    ))
 }
 
 fn save_pyproject_toml_file(project_info: &ProjectInfo) -> Result<()> {
     let file_path = project_info.base_dir().join("pyproject.toml");
-    let content = create_pyproject_toml(project_info);
+    let content = create_pyproject_toml(project_info)?;
 
     save_file_with_content(&file_path, &content)?;
 
@@ -473,7 +481,8 @@ fn save_dev_requirements(project_info: &ProjectInfo) -> Result<()> {
     let content = build_latest_dev_dependencies(
         project_info.download_latest_packages,
         &project_info.project_manager,
-    );
+        &project_info.min_python_version,
+    )?;
 
     save_file_with_content(&file_path, &content)?;
 

src/python_files.rs

@@ -4,6 +4,7 @@ use anyhow::{bail, Result};
 
 use crate::file_manager::save_file_with_content;
 use crate::project_info::{ProjectInfo, ProjectManager};
+use crate::utils::is_python_312_or_greater;
 
 fn create_dunder_main_file(module: &str) -> String {
     format!(
@@ -200,7 +201,11 @@ fn save_version_file(project_info: &ProjectInfo) -> Result<()> {
     Ok(())
 }
 
-fn create_version_test_file(module: &str, project_manager: &ProjectManager) -> String {
+fn create_version_test_file(
+    module: &str,
+    project_manager: &ProjectManager,
+    min_python_version: &str,
+) -> Result<String> {
     let version_test: &str = match project_manager {
         ProjectManager::Maturin => {
             r#"def test_versions_match():
@@ -221,18 +226,30 @@ fn create_version_test_file(module: &str, project_manager: &ProjectManager) -> S
     assert VERSION == pyproject_version"#
         }
         ProjectManager::Setuptools => {
-            return format!(
+            return Ok(format!(
                 r#"from {module}._version import VERSION
 
 def test_versions_match():
     assert VERSION == "0.1.0"
 "#
-            )
+            ))
         }
     };
 
-    format!(
-        r#"import sys
+    if is_python_312_or_greater(min_python_version)? {
+        Ok(format!(
+            r#"import tomllib
+from pathlib import Path
+
+from {module}._version import VERSION
+
+
+{version_test}
+"#
+        ))
+    } else {
+        Ok(format!(
+            r#"import sys
 from pathlib import Path
 
 from {module}._version import VERSION
@@ -245,13 +262,18 @@ else:
 
 {version_test}
 "#
-    )
+        ))
+    }
 }
 
 fn save_version_test_file(project_info: &ProjectInfo) -> Result<()> {
     let module = project_info.source_dir.replace([' ', '-'], "_");
     let file_path = project_info.base_dir().join("tests/test_version.py");
-    let content = create_version_test_file(&module, &project_info.project_manager);
+    let content = create_version_test_file(
+        &module,
+        &project_info.project_manager,
+        &project_info.min_python_version,
+    )?;
     save_file_with_content(&file_path, &content)?;
 
     Ok(())
@@ -483,9 +505,26 @@ mod tests {
     }
 
     #[test]
-    fn test_save_version_test_file_poetry() {
+    fn test_save_version_test_file_poetry_tomli() {
+        let mut project_info = project_info_dummy();
+        project_info.project_manager = ProjectManager::Poetry;
+        let base = project_info.base_dir();
+        create_dir_all(base.join("tests")).unwrap();
+        let expected_file = base.join("tests/test_version.py");
+        save_version_test_file(&project_info).unwrap();
+
+        assert!(expected_file.is_file());
+
+        let content = std::fs::read_to_string(expected_file).unwrap();
+
+        assert_yaml_snapshot!(content);
+    }
+
+    #[test]
+    fn test_save_version_test_file_poetry_no_tomli() {
         let mut project_info = project_info_dummy();
         project_info.project_manager = ProjectManager::Poetry;
+        project_info.min_python_version = "3.12".to_string();
         let base = project_info.base_dir();
         create_dir_all(base.join("tests")).unwrap();
         let expected_file = base.join("tests/test_version.py");

src/snapshots/python_project__python_files__tests__save_version_test_file_poetry_no_tomli.snap

@@ -0,0 +1,5 @@
+---
+source: src/python_files.rs
+expression: content
+---
+"import tomllib\nfrom pathlib import Path\n\nfrom my_project._version import VERSION\n\n\ndef test_versions_match():\n    pyproject = Path().absolute() / \"pyproject.toml\"\n    with open(pyproject, \"rb\") as f:\n        data = tomllib.load(f)\n        pyproject_version = data[\"tool\"][\"poetry\"][\"version\"]\n\n    assert VERSION == pyproject_version\n"

src/snapshots/python_project__python_files__tests__save_version_test_file_poetry.snap renamed to src/snapshots/python_project__python_files__tests__save_version_test_file_poetry_tomli.snap

@@ -0,0 +1,38 @@
+use anyhow::Result;
+
+pub fn is_python_312_or_greater(version: &str) -> Result<bool> {
+    let mut split_version = version.split('.');
+    if let Some(v) = split_version.nth(1) {
+        let min = v.parse::<i32>()?;
+        if min >= 12 {
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    } else {
+        Ok(false)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_python_312() {
+        let result = is_python_312_or_greater("3.12").unwrap();
+        assert!(result);
+    }
+
+    #[test]
+    fn test_python_313() {
+        let result = is_python_312_or_greater("3.13").unwrap();
+        assert!(result);
+    }
+
+    #[test]
+    fn test_python_311() {
+        let result = is_python_312_or_greater("3.11").unwrap();
+        assert!(!result);
+    }
+}