python-package-folder 2.0.6__py3-none-any.whl → 2.0.7__py3-none-any.whl

python_package_folder/analyzer.py

@@ -328,6 +328,59 @@ class ImportAnalyzer:
             if potential_file.exists():
                 return potential_file
 
+            # Check all subdirectories in parent (not just common ones)
+            # This handles cases like src/data/spreadsheet_creation/spreadsheet_formatting_dataclasses.py
+            if parent.is_dir():
+                try:
+                    for subdir in parent.iterdir():
+                        if not subdir.is_dir():
+                            continue
+                        # Skip common excluded patterns
+                        if subdir.name.startswith("_SS") or subdir.name.startswith("__SS"):
+                            continue
+                        # Check if module file exists directly in subdirectory
+                        potential_subdir_file = subdir / f"{module_name.split('.')[-1]}.py"
+                        if potential_subdir_file.exists():
+                            return potential_subdir_file
+                        # Check if module directory exists in subdirectory
+                        potential_subdir_module = subdir / module_name.replace(".", "/")
+                        if (
+                            potential_subdir_module.is_dir()
+                            and (potential_subdir_module / "__init__.py").exists()
+                        ):
+                            return potential_subdir_module / "__init__.py"
+                        if potential_subdir_module.with_suffix(".py").is_file():
+                            return potential_subdir_module.with_suffix(".py")
+                        # Check nested subdirectories (e.g., data/spreadsheet_creation)
+                        # Recursively check subdirectories up to 2 levels deep
+                        try:
+                            for nested_subdir in subdir.iterdir():
+                                if not nested_subdir.is_dir():
+                                    continue
+                                # Check if module file exists in nested subdirectory
+                                potential_nested_file = (
+                                    nested_subdir / f"{module_name.split('.')[-1]}.py"
+                                )
+                                if potential_nested_file.exists():
+                                    return potential_nested_file
+                                # Check if module directory exists in nested subdirectory
+                                potential_nested_module = nested_subdir / module_name.replace(
+                                    ".", "/"
+                                )
+                                if (
+                                    potential_nested_module.is_dir()
+                                    and (potential_nested_module / "__init__.py").exists()
+                                ):
+                                    return potential_nested_module / "__init__.py"
+                                if potential_nested_module.with_suffix(".py").is_file():
+                                    return potential_nested_module.with_suffix(".py")
+                        except (OSError, PermissionError):
+                            # Skip nested directories we can't read
+                            continue
+                except (OSError, PermissionError):
+                    # Skip directories we can't read
+                    continue
+
             # Check common subdirectories in parent (e.g., _shared, shared, common)
             # This handles cases like src/_shared/better_enum.py
             common_subdirs = ["_shared", "shared", "common", "_common"]

python_package_folder/manager.py

@@ -563,21 +563,23 @@ class BuildManager:
                         # Fallback to using the import name
                         third_party_packages.add(root_module)
                 # If it's ambiguous or unresolved, and not stdlib/local/external,
-                # it's likely a third-party package that needs to be declared
+                # only add as dependency if we can verify it's actually an installed package
                 elif imp.classification == "ambiguous" or imp.classification is None:
                     # Check if it's not a local or external module
                     if not imp.resolved_path:
+                        # Try to verify it's actually an installed package before adding
                         # Check cache first
                         if root_module not in package_name_cache:
                             package_name_cache[root_module] = self._get_package_name_from_import(
                                 imp.module_name
                             )
                         actual_package = package_name_cache[root_module]
+                        # Only add if we can verify it's an actual installed package
+                        # Don't add ambiguous imports that we can't verify
                         if actual_package:
                             third_party_packages.add(actual_package)
-                        else:
-                            # Fallback: use import name (will be normalized later)
-                            third_party_packages.add(root_module)
+                        # If we can't verify it's a package, don't add it
+                        # (it's likely a local file that wasn't resolved properly)
 
         if total_files > 50:
             print()  # New line after progress indicator

{python_package_folder-2.0.6.dist-info → python_package_folder-2.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 2.0.6
+Version: 2.0.7
 Summary: Python package to automatically package and build a folder, fetching all relevant dependencies.
 Project-URL: Repository, https://github.com/alelom/python-package-folder
 Author-email: Alessio Lombardi <work@alelom.com>

{python_package_folder-2.0.6.dist-info → python_package_folder-2.0.7.dist-info}/RECORD

@@ -1,8 +1,8 @@
 python_package_folder/__init__.py,sha256=DQt-uldOEKfh0MUqCvKdeNKOnpuOvpb7blYvXMyO9Wc,719
 python_package_folder/__main__.py,sha256=a-__-VLhYw-J7S7CsHdhtEvQr3RiAZxiYDvKhKTgMX4,291
-python_package_folder/analyzer.py,sha256=r8Iv8aF5kqRROJ1aFZW-TP9Mkl0EUb8ZfgN1Bv1-RzY,13452
+python_package_folder/analyzer.py,sha256=cmTNUDCWBIh3XZ_mShlQVG1P9NN_oe3FUBTirVtYfTQ,16709
 python_package_folder/finder.py,sha256=_LvJ9xBVKv41UK5sbwbNyKmuYjAOqUbzvZhK7NCYQF8,9130
-python_package_folder/manager.py,sha256=AntYMFyfus8z7dN4ygC4yFXINTtkKSrZZ615wVtvitg,41026
+python_package_folder/manager.py,sha256=L-NRTUd0q-qhhEXUCPcddRyR736-GpPf2gwznmnMWDs,41268
 python_package_folder/publisher.py,sha256=TSjdOvxvnWLbJCnduTK_xZBRfvsrq9kpEH-sfebeWkU,13507
 python_package_folder/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_package_folder/python_package_folder.py,sha256=RPsqRcIy_LjzzTHdp4qdtFJ4-4xhtR_0YLIC0RlUxFo,8841
@@ -10,8 +10,8 @@ python_package_folder/subfolder_build.py,sha256=LMiJ4Ck6PW1x3hmiSK-9fDH4Q6RrHqot
 python_package_folder/types.py,sha256=3yeSRR5p_3PDKEAaehW_RJ7NwJHexOIeA08bGaT1iSY,2368
 python_package_folder/utils.py,sha256=lIkWsFKeAYAJ9TDUM99T4pUBHJVbUvCdUgkWQN-LUho,3111
 python_package_folder/version.py,sha256=kIDP6S9trEfs9gj7lBYGxrWm4RPssRla24UtlO9Jkh4,9111
-python_package_folder-2.0.6.dist-info/METADATA,sha256=VMxg5LoYfUC1ikyrWHsfAqio60V5Xrg2601wNad0w_Q,33282
-python_package_folder-2.0.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-python_package_folder-2.0.6.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-2.0.6.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-2.0.6.dist-info/RECORD,,
+python_package_folder-2.0.7.dist-info/METADATA,sha256=6BRjE5zR5JZepndwwM6ad0rZMI_uCXa70X9qthD4bMU,33282
+python_package_folder-2.0.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+python_package_folder-2.0.7.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-2.0.7.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-2.0.7.dist-info/RECORD,,