fix tests now that pyo3 serializes PathBuf into Path instead of str

Author: DetachHead

python/tach/extension.pyi

@@ -142,7 +142,7 @@ class ProjectConfig:
     cache: CacheConfig
     external: ExternalDependencyConfig
     exclude: list[str]
-    source_roots: list[str]
+    source_roots: list[Path]
     exact: bool
     disable_logging: bool
     ignore_type_checking_imports: bool

python/tach/mod.py

@@ -63,7 +63,7 @@ def handle_utility_edits(
 
 
 def handle_source_root_edits(
-    project_config: ProjectConfig, selected_source_roots: list[str]
+    project_config: ProjectConfig, selected_source_roots: list[Path]
 ) -> None:
     existing_source_roots = set(project_config.source_roots)
     selected_source_roots_set = set(selected_source_roots)
@@ -93,8 +93,7 @@ def apply_selected_configuration(
         project_config.set_location(project_config_path)
 
     relative_selected_source_roots = [
-        str(source_root.relative_to(project_root))
-        for source_root in selected_source_roots
+        source_root.relative_to(project_root) for source_root in selected_source_roots
     ]
     handle_source_root_edits(project_config, relative_selected_source_roots)
 

python/tests/test_mod.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from pathlib import Path
 from unittest.mock import patch
 
 import pytest
@@ -51,7 +52,7 @@ def test_mod_edit_interactive_new_configuration(
 
         # Verify the saved configuration
         saved_config = parse_project_config(temp_project_dir)
-        assert set(saved_config.source_roots) == {"src"}
+        assert set(saved_config.source_roots) == {Path("src")}
         assert set(saved_config.module_paths()) == {"module1", "module2", "utils"}
         assert set(saved_config.utility_paths()) == {"utils"}
 
@@ -123,7 +124,7 @@ def test_mod_edit_interactive_update_existing(temp_project_dir, initial_project_
         mock_get.assert_called_once()
 
         saved_config = parse_project_config(temp_project_dir)
-        assert set(saved_config.source_roots) == {"src", "tests"}
+        assert set(saved_config.source_roots) == {Path("src"), Path("tests")}
         assert set(saved_config.module_paths()) == {"new_module", "new_utility"}
         assert set(saved_config.utility_paths()) == {"new_utility"}
 
@@ -152,6 +153,6 @@ def test_mod_edit_interactive_update_existing(temp_project_dir, initial_project_
 
         # Verify final configuration
         final_config = parse_project_config(temp_project_dir)
-        assert set(final_config.source_roots) == {"src"}
+        assert set(final_config.source_roots) == {Path("src")}
         assert set(final_config.module_paths()) == {"new_module", "another_module"}
         assert set(final_config.utility_paths()) == set()

src/commands/helpers/import.rs

@@ -20,7 +20,7 @@ impl<'py> IntoPyObject<'py> for LocatedImport {
     type Target = PythonImport;
     type Output = Bound<'py, Self::Target>;
     type Error = pyo3::PyErr;
-    fn into_pyobject(self, py: Python<'py>) -> std::result::Result<Self::Output, Self::Error>  {
+    fn into_pyobject(self, py: Python<'py>) -> std::result::Result<Self::Output, Self::Error> {
         PythonImport {
             module_path: self.import.module_path,
             line_number: self.alias_line_number,

src/config/rules.rs

@@ -40,7 +40,10 @@ impl<'py> IntoPyObject<'py> for RuleSetting {
     type Target = PyString;
     type Output = Bound<'py, Self::Target>;
     type Error = std::convert::Infallible;
-    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, <RuleSetting as IntoPyObject<'py>>::Error> {
+    fn into_pyobject(
+        self,
+        py: Python<'py>,
+    ) -> Result<Self::Output, <RuleSetting as IntoPyObject<'py>>::Error> {
         match self {
             Self::Error => "error".into_pyobject(py),
             Self::Warn => "warn".into_pyobject(py),

src/lib.rs

@@ -339,10 +339,7 @@ fn extension(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<dep_map::PyDirection>()?;
     m.add_class::<test::TachPytestPluginHandler>()?;
     m.add_function(wrap_pyfunction!(parse_project_config, m)?)?;
-    m.add_function(wrap_pyfunction!(
-        parse_project_config_from_pyproject,
-        m
-    )?)?;
+    m.add_function(wrap_pyfunction!(parse_project_config_from_pyproject, m)?)?;
     m.add_function(wrap_pyfunction!(get_project_imports, m)?)?;
     m.add_function(wrap_pyfunction!(get_external_imports, m)?)?;
     m.add_function(wrap_pyfunction!(check_external_dependencies, m)?)?;