summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Bravalheri <andersonbravalheri@gmail.com>2022-04-09 17:01:14 +0100
committerAnderson Bravalheri <andersonbravalheri@gmail.com>2022-06-15 16:43:50 +0100
commitf210f161cf01648168fec05ed69d776f0ebbb156 (patch)
treee21a44de5aeb6668409a115daaf304e865c6def0
parentdd9886c41a7ae3fa33d0270ac4eaa89bd7be9bdf (diff)
downloadpython-setuptools-git-f210f161cf01648168fec05ed69d776f0ebbb156.tar.gz
Relax file types in discovery
-rw-r--r--setuptools/discovery.py21
1 files changed, 17 insertions, 4 deletions
diff --git a/setuptools/discovery.py b/setuptools/discovery.py
index 95c3c7f8..6a3d2c9d 100644
--- a/setuptools/discovery.py
+++ b/setuptools/discovery.py
@@ -42,8 +42,18 @@ import os
from fnmatch import fnmatchcase
from glob import glob
from pathlib import Path
-from typing import TYPE_CHECKING
-from typing import Callable, Dict, Iterator, Iterable, List, Optional, Tuple, Union
+from typing import (
+ TYPE_CHECKING,
+ Callable,
+ Dict,
+ Iterable,
+ Iterator,
+ List,
+ Mapping,
+ Optional,
+ Tuple,
+ Union
+)
import _distutils_hack.override # noqa: F401
@@ -435,6 +445,7 @@ class ConfigDiscovery:
def _ensure_no_accidental_inclusion(self, detected: List[str], kind: str):
if len(detected) > 1:
from inspect import cleandoc
+
from setuptools.errors import PackageDiscoveryError
msg = f"""Multiple top-level {kind} discovered in a flat-layout: {detected}.
@@ -527,7 +538,7 @@ def remove_stubs(packages: List[str]) -> List[str]:
def find_parent_package(
- packages: List[str], package_dir: Dict[str, str], root_dir: _Path
+ packages: List[str], package_dir: Mapping[str, str], root_dir: _Path
) -> Optional[str]:
"""Find the parent package that is not a namespace."""
packages = sorted(packages, key=len)
@@ -550,7 +561,9 @@ def find_parent_package(
return None
-def find_package_path(name: str, package_dir: Dict[str, str], root_dir: _Path) -> str:
+def find_package_path(
+ name: str, package_dir: Mapping[str, str], root_dir: _Path
+) -> str:
"""Given a package name, return the path where it should be found on
disk, considering the ``package_dir`` option.