python-discovery 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

python_discovery/_cached_py_info.py

@@ -41,6 +41,9 @@ _CACHE: OrderedDict[Path, PythonInfo | Exception] = OrderedDict()
 _CACHE[Path(sys.executable)] = PythonInfo()
 _LOGGER: Final[logging.Logger] = logging.getLogger(__name__)
 _PY_INFO_SCRIPT: Final[Path] = Path(__file__).resolve().parent / "_py_info_collect.py"
+_DEFAULT_QUERY_TIMEOUT: Final[float] = 15.0
+# poll(2) limits milliseconds to a signed C int.
+_MAX_QUERY_TIMEOUT: Final[float] = (2**31 - 1) / 1000
 
 
 class _UnsupportedInterpreterError(RuntimeError):
@@ -136,7 +139,7 @@ def _read_cache_entry(
 ) -> PythonInfo | _UnsupportedInterpreterError | None:
     if not py_info_store.exists() or (data := py_info_store.read()) is None:
         return None
-    if all(data.get(key) == value for key, value in entry_meta.items()):
+    if isinstance(data, dict) and all(data.get(key) == value for key, value in entry_meta.items()):
         if isinstance(unsupported := data.get("unsupported"), str):
             return _UnsupportedInterpreterError(unsupported)
         if isinstance(content := data.get("content"), dict):
@@ -152,10 +155,10 @@ def _load_cached_py_info(
 ) -> PythonInfo | None:
     try:
         py_info = cls.from_dict(content.copy())
-    except (KeyError, TypeError):
-        py_info_store.remove()
-        return None
-    if (sys_exe := py_info.system_executable) is not None and not Path(sys_exe).exists():
+        stale = (sys_exe := py_info.system_executable) is not None and not Path(sys_exe).is_file()
+    except (AttributeError, KeyError, OSError, TypeError):
+        stale = True
+    if stale:
         py_info_store.remove()
         return None
     return py_info
@@ -214,7 +217,7 @@ def _run_subprocess(
 ) -> tuple[Exception | None, PythonInfo | None]:
     start_cookie = gen_cookie()
     end_cookie = gen_cookie()
-    timeout = float(env.get("PY_DISCOVERY_TIMEOUT", "15"))
+    timeout = _query_timeout(env.get("PY_DISCOVERY_TIMEOUT"))
     with _resolve_py_info_script() as py_info_script:
         cmd = [exe, str(py_info_script), start_cookie, end_cookie]
         env = dict(env)
@@ -264,6 +267,22 @@ def _run_subprocess(
     return None, result
 
 
+@lru_cache(maxsize=128)
+def _query_timeout(raw: str | None) -> float | None:
+    if raw is None:
+        return _DEFAULT_QUERY_TIMEOUT
+    try:
+        timeout = float(raw)
+    except ValueError:
+        timeout = 0.0
+    if timeout > 0:
+        return timeout if timeout <= _MAX_QUERY_TIMEOUT else None
+    _LOGGER.warning(
+        "ignoring PY_DISCOVERY_TIMEOUT=%r, not a positive number of seconds; using %s", raw, _DEFAULT_QUERY_TIMEOUT
+    )
+    return _DEFAULT_QUERY_TIMEOUT
+
+
 def _query_failure(exe: str, out: str, err: str | None, code: int | None) -> RuntimeError:
     # the gate's exit code and stderr marker must both be present: either alone can collide, an errno of 79 from a
     # failed exec or a shim that echoes the marker phrase, but only the gate produces the combination

python_discovery/_discovery.py

@@ -423,7 +423,12 @@ def get_paths(env: Mapping[str, str]) -> Generator[Path, None, None]:
         except (AttributeError, ValueError):  # pragma: no cover # Windows only (no confstr)
             path = os.defpath
     if path:
-        for entry in map(Path, path.split(os.pathsep)):
+        # An empty component (a leading/trailing/doubled separator) means "the current directory", the
+        # same footgun a shell has when PATH is misconfigured - Path("") resolves to it. Since every
+        # yielded path here is later searched for interpreters to execute and interrogate, silently
+        # including the caller's CWD would let whatever directory virtualenv happens to run from smuggle
+        # in a candidate binary.
+        for entry in map(Path, filter(None, path.split(os.pathsep))):
             with suppress(OSError):
                 if entry.is_dir() and next(entry.iterdir(), None):
                     yield entry

python_discovery/_py_info_collect.py

@@ -321,7 +321,7 @@ class PythonInfoCollector:
             "script_args": "--no-user-cfg",
         })  # conf files not parsed so they do not hijack paths
         if hasattr(sys, "_framework"):  # pragma: no cover # macOS framework builds only
-            sys._framework = None  # ruff:ignore[private-member-access]  # disable macOS static paths for framework
+            sys._framework = None  # ty: ignore[invalid-assignment]  # ruff:ignore[private-member-access]  # disable macOS static paths for framework
 
         with warnings.catch_warnings():  # disable warning for PEP-632
             warnings.simplefilter("ignore")

{python_discovery-1.6.0.dist-info → python_discovery-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-discovery
-Version: 1.6.0
+Version: 1.6.2
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io
@@ -35,7 +35,6 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -46,8 +45,8 @@ Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
-Requires-Dist: filelock>=3.15.4
+Requires-Python: >=3.9
+Requires-Dist: filelock>=3.16.1
 Description-Content-Type: text/markdown
 
 # [`python-discovery`](https://python-discovery.readthedocs.io/en/latest/)
@@ -68,7 +67,7 @@ the right one for you.
 Give it a requirement like `python3.12` or `>=3.11,<3.13`, and it searches all known locations, verifies each candidate,
 and returns detailed metadata about the match. Results are cached to disk so repeated lookups are fast.
 
-The library runs on Python 3.8+ and discovers interpreters as old as Python 3.6; anything older is skipped with a
+The library runs on Python 3.9+ and discovers interpreters as old as Python 3.6; anything older is skipped with a
 warning naming the version it found.
 
 ## Usage

{python_discovery-1.6.0.dist-info → python_discovery-1.6.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 python_discovery/__init__.py,sha256=Hi4j3pMvC8Fo8KoNL-wOHsPSCUHwY4c0qvv5sjnFzME,808
 python_discovery/_cache.py,sha256=svmG2GzUQzd2xTjAbm2eX1CKxxGAglfv4kxaPuxwPIA,5147
-python_discovery/_cached_py_info.py,sha256=MKV2sjrrypq-7gcOdw9GpAooMJl9kYCTAlYeUwO3ndQ,10473
+python_discovery/_cached_py_info.py,sha256=d-46_ydj-tJNUwaJK5CHp5OKooJkW2t7lWVNBg9Fa4U,11151
 python_discovery/_compat.py,sha256=iqxGuhK9rPaiui80G1H1KrweoMJ16gyLYEmUrSXrp5c,709
-python_discovery/_discovery.py,sha256=ABPD8MRweUO6B7cG3U3ZBfUIYs08rh6dYPA225EURyY,22032
+python_discovery/_discovery.py,sha256=BDHC1XEx0XNStEIbXjujpHHm0nkBpe26bl26YVHSWhM,22488
 python_discovery/_py_info.py,sha256=dov0UFDbcbKlNW765puRgLQuAvbc_ze0Mpsdb7Tixgs,25797
-python_discovery/_py_info_collect.py,sha256=YhF5U-kKcwMXZMfRNDlZK6kCPJJI9tHIvd5SjQqMJqY,16126
+python_discovery/_py_info_collect.py,sha256=3PNlySbxNSHDjBw8KJ_olVpOXww1qhGdY28YoLfF0Z8,16160
 python_discovery/_py_spec.py,sha256=O1RMC9JQ7m5SRzF6cEELxnIWZpadXYWO4bWDD7TemUs,10965
 python_discovery/_specifier.py,sha256=o7MHb0z_mFSLz9gXqMwJoNkHYjgi2biq3Ibvd0_slvc,10457
 python_discovery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_discovery/_windows/__init__.py,sha256=qthcyGh36b3WkeSbZ4ECRRYLbCOCaQu5X_DRZ98tXfk,315
 python_discovery/_windows/_pep514.py,sha256=1TqLTdofSCPu3VFE7D4u2fXweyaqhKJR7b48VmJ9AQQ,7787
 python_discovery/_windows/_propose.py,sha256=iMJf6l0TU4SvuV8UsCHHINAe9L5dUT949xyeyMVdong,1565
-python_discovery-1.6.0.dist-info/METADATA,sha256=bBHr6H593h-sswZAXhVWXrxIp1XfPZOocZBf80H2hRU,5132
-python_discovery-1.6.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_discovery-1.6.0.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.6.0.dist-info/RECORD,,
+python_discovery-1.6.2.dist-info/METADATA,sha256=siAqGU63m_LkmFYyYUsdDKAFl5m9ur1upsL1mNvKrJs,5082
+python_discovery-1.6.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_discovery-1.6.2.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.6.2.dist-info/RECORD,,

{python_discovery-1.6.0.dist-info → python_discovery-1.6.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.0
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any