Fix requirements.txt unit tests

Author: markdlv-sf

src/datacustomcode/scan.py

@@ -243,11 +243,10 @@ def write_requirements_file(file_path: str) -> str:
     """
     imports = scan_file_for_imports(file_path)
 
-    # Use the parent directory rather than same directory as the file
+    # Write requirements.txt in the parent directory of the Python file
     file_dir = os.path.dirname(file_path)
-    output_dir = os.path.dirname(file_dir) if file_dir else "."
-
-    requirements_path = os.path.join(output_dir, "requirements.txt")
+    parent_dir = os.path.dirname(file_dir) if file_dir else "."
+    requirements_path = os.path.join(parent_dir, "requirements.txt")
 
     # If the file exists, read existing requirements and merge with new ones
     existing_requirements = set()

tests/test_scan.py

@@ -453,31 +453,50 @@ def test_scan_file_for_imports(self):
 
     def test_write_requirements_file_new(self):
         """Test writing a new requirements.txt file."""
+        # Create a temporary directory structure
+        temp_dir = tempfile.mkdtemp()
+        script_dir = os.path.join(temp_dir, "script_dir")
+        os.makedirs(script_dir)
+
         content = textwrap.dedent(
             """
             import pandas as pd
             import numpy as np
             """
         )
-        temp_path = create_test_script(content)
+        temp_path = os.path.join(script_dir, "test_script.py")
+        with open(temp_path, "w") as f:
+            f.write(content)
+
+        requirements_path = None
         try:
             requirements_path = write_requirements_file(temp_path)
             assert os.path.exists(requirements_path)
+            assert (
+                os.path.dirname(requirements_path) == temp_dir
+            )  # Should be in parent directory
 
             with open(requirements_path, "r") as f:
                 requirements = {line.strip() for line in f}
 
             assert "pandas" in requirements
             assert "numpy" in requirements
         finally:
-            os.unlink(temp_path)
-            if os.path.exists(requirements_path):
+            if os.path.exists(temp_path):
+                os.unlink(temp_path)
+            if requirements_path and os.path.exists(requirements_path):
                 os.unlink(requirements_path)
+            os.rmdir(script_dir)
+            os.rmdir(temp_dir)
 
     def test_write_requirements_file_merge(self):
         """Test merging with existing requirements.txt file."""
-        # First create an existing requirements.txt
+        # Create a temporary directory structure
         temp_dir = tempfile.mkdtemp()
+        script_dir = os.path.join(temp_dir, "script_dir")
+        os.makedirs(script_dir)
+
+        # Create existing requirements.txt in parent directory
         existing_requirements = os.path.join(temp_dir, "requirements.txt")
         with open(existing_requirements, "w") as f:
             f.write("pandas\nnumpy\n")
@@ -491,10 +510,17 @@ def test_write_requirements_file_merge(self):
             import matplotlib
             """
         )
-        temp_path = create_test_script(content)
+        temp_path = os.path.join(script_dir, "test_script.py")
+        with open(temp_path, "w") as f:
+            f.write(content)
+
+        requirements_path = None
         try:
             requirements_path = write_requirements_file(temp_path)
             assert os.path.exists(requirements_path)
+            assert (
+                os.path.dirname(requirements_path) == temp_dir
+            )  # Should be in parent directory
 
             with open(requirements_path, "r") as f:
                 requirements = {line.strip() for line in f}
@@ -505,11 +531,13 @@ def test_write_requirements_file_merge(self):
             assert "scipy" in requirements
             assert "matplotlib" in requirements
         finally:
-            os.unlink(temp_path)
-            if os.path.exists(requirements_path):
+            if os.path.exists(temp_path):
+                os.unlink(temp_path)
+            if requirements_path and os.path.exists(requirements_path):
                 os.unlink(requirements_path)
             if os.path.exists(existing_requirements):
                 os.unlink(existing_requirements)
+            os.rmdir(script_dir)
             os.rmdir(temp_dir)
 
     def test_standard_library_exclusion(self):