pipgrip 0.10.9__tar.gz → 0.10.11__tar.gz

{pipgrip-0.10.9/src/pipgrip.egg-info → pipgrip-0.10.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pipgrip
-Version: 0.10.9
+Version: 0.10.11
 Summary: Lightweight pip dependency resolver with deptree preview functionality based on the PubGrub algorithm
 Home-page: https://github.com/ddelange/pipgrip
 Author: ddelange

pipgrip-0.10.11/src/pipgrip/_repo_version.py

@@ -0,0 +1 @@
+version = "0.10.11"

{pipgrip-0.10.9 → pipgrip-0.10.11}/src/pipgrip/cli.py

@@ -2,6 +2,7 @@ import io
 import logging
 import os
 import re
+import sys
 from collections import OrderedDict
 from functools import partial
 from json import dumps
@@ -163,13 +164,15 @@ def build_tree(source, decision_packages):
 
 
 def render_tree(tree_root, max_depth, tree_ascii=False):
-    # Windows' cp1252 encoding does not supports anytree's unicode markers.
-    # Even in Github Actions where the windows runner has PYTHONUTF8 mode enabled,
-    # `if sys.getfilesystemencoding() == "cp1252":` check is insufficient and the
-    # error is still raised in CI.
-    # Hence disabling unicode trees altogether for Windows.
-    # ref https://github.com/pallets/click/issues/2121#issuecomment-1312773882
-    if click.utils.WIN:  # pragma: no cover
+    # click.echo on Windows' cp1252 encoding does not supports anytree's unicode markers
+    # ref https://github.com/pallets/click/issues/2121#issuecomment-1809693939
+    # so check for UTF-8 mode https://docs.python.org/3/library/os.html#utf8-mode
+    # PEP 686: Python 3.15 will make Python UTF-8 Mode default
+    if (  # pragma: no cover
+        not tree_ascii
+        and hasattr(sys.stdout, "encoding")
+        and not sys.stdout.encoding.lower().startswith("utf")
+    ):
         tree_ascii = True
     style = AsciiStyle() if tree_ascii else ContStyle()
     output = []

{pipgrip-0.10.9 → pipgrip-0.10.11}/src/pipgrip/pipper.py

@@ -309,9 +309,15 @@ def _get_package_report(
             "--trusted-host",
             urlparse(extra_index_url).hostname,
         ]
-    args += ["--report", "-", package]
+
+    # Windows disallows opening fp a second time (within the pip subprocess)
+    # So close it here, and delete it manually
+    with NamedTemporaryFile(delete=False, mode="w+") as fp:
+        report_file = fp.name
+
+    args += ["--report", report_file, package]
     try:
-        out = stream_bash_command(args)
+        stream_bash_command(args)
     except subprocess.CalledProcessError as err:
         output = getattr(err, "output") or ""
         logger.error(
@@ -320,8 +326,11 @@ def _get_package_report(
             )
         )
         raise RuntimeError("Failed to get report for {}".format(package))
-    report = json.loads(out)
-    return report
+    else:
+        with io.open(report_file, "r", encoding="utf-8") as fp:
+            return json.load(fp)
+    finally:
+        os.remove(report_file)
 
 
 def _download_wheel(

{pipgrip-0.10.9 → pipgrip-0.10.11/src/pipgrip.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pipgrip
-Version: 0.10.9
+Version: 0.10.11
 Summary: Lightweight pip dependency resolver with deptree preview functionality based on the PubGrub algorithm
 Home-page: https://github.com/ddelange/pipgrip
 Author: ddelange

pipgrip-0.10.9/src/pipgrip/_repo_version.py

@@ -1 +0,0 @@
-version = "0.10.9"