Apply variant of fix for wrong cononical name in Pipfile. (#6413)

* Apply variant of fix for wrong cononical name in Pipfile.

* Fix test for py 3.12+

* Update tests/integration/test_install_nested_setup.py

Co-authored-by: Copilot <[email protected]>
Co-authored-by: stewartmiles

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: stewartmiles

Author: matteius

pipenv/utils/dependencies.py

@@ -684,9 +684,10 @@ def find_package_name_from_directory(directory):
             directory_path = Path(directory_str[1:])
 
     try:
-        # Sort contents - directories first, then files
+        # Sort contents - files first, then directories to search parent
+        # directories before leaf directories.
         directory_contents = sorted(
-            directory_path.iterdir(), key=lambda x: (x.is_file(), x.name)
+            directory_path.iterdir(), key=lambda x: (x.is_dir(), x.name)
         )
 
         for path in directory_contents:
@@ -844,31 +845,34 @@ def determine_package_name(package: InstallRequirement):
 
 
 def find_package_name_from_filename(filename, file):
-    if filename.endswith("METADATA"):
+    # Extract basename to handle both full paths (from archives) and basenames (from directories)
+    basename = Path(filename).name
+
+    if basename == "METADATA":
         content = file.read().decode()
         possible_name = parse_metadata_file(content)
         if possible_name:
             return possible_name
 
-    if filename.endswith("PKG-INFO"):
+    if basename == "PKG-INFO":
         content = file.read().decode()
         possible_name = parse_pkginfo_file(content)
         if possible_name:
             return possible_name
 
-    if filename.endswith("setup.py"):
+    if basename == "setup.py":
         content = file.read().decode()
         possible_name = parse_setup_file(content)
         if possible_name:
             return possible_name
 
-    if filename.endswith("setup.cfg"):
+    if basename == "setup.cfg":
         content = file.read().decode()
         possible_name = parse_cfg_file(content)
         if possible_name:
             return possible_name
 
-    if filename.endswith("pyproject.toml"):
+    if basename == "pyproject.toml":
         content = file.read().decode()
         possible_name = parse_toml_file(content)
         if possible_name:

tests/integration/test_install_nested_setup.py

@@ -0,0 +1,67 @@
+import os
+from pathlib import Path
+
+import pytest
+
+
+@pytest.mark.install
+@pytest.mark.needs_internet
+@pytest.mark.skipif(
+    os.name == "nt",
+    reason="This test is not for Windows",
+)
+def test_install_path_with_nested_setup_module(pipenv_instance_pypi):
+    with pipenv_instance_pypi() as p:
+        # Install setuptools first for Python 3.12+ compatibility
+        c = p.pipenv("install setuptools")
+        assert c.returncode == 0
+
+        # Create a simple package.
+        package_dir = Path(p.path) / "simple_package"
+        package_dir.mkdir()
+
+        # Create a simple setup.py file
+        with open(package_dir / "setup.py", "w") as f:
+            f.write("""
+from setuptools import setup, find_packages
+
+setup(
+    name="simple-package",
+    version="0.1.0",
+    packages=find_packages(),
+)
+""")
+        module_dir = package_dir / "simple_package"
+        module_dir.mkdir()
+
+        (module_dir / "__init__.py").touch()
+
+        # Create a test module that contains setup.py-like content but isn't setup.py
+        with open(module_dir / "test_setup.py", "w") as f:
+            f.write("""
+def setup(name = ''):
+    return f'Setup package {name}'
+
+def configure():
+    return setup(name='my_simple_package')
+""")
+
+        # Install the package using a path with spaces
+        # Use both escaped spaces and quoted path to test both scenarios
+        relative_package_dir = f'"{package_dir.relative_to(p.path)}"'
+        c = p.pipenv(f'install -e {relative_package_dir}')
+        assert c.returncode == 0
+
+        # Verify the package was installed correctly
+        c = p.pipenv('run python -c "'
+                     'import simple_package.test_setup; '
+                     'print(simple_package.test_setup.configure())"')
+        assert c.returncode == 0
+        assert "Setup package my_simple_package" in c.stdout
+
+        # Ensure my_simple_package was not parsed from the test_setup.py module
+        # inside the package - this is the key test for our fix.
+        with open(Path(p.path) / "Pipfile") as f:
+            pipfile_content = f.read()
+            assert "my_simple_package" not in pipfile_content
+            assert "simple-package" in pipfile_content  # Should find the correct name