sentry-devenv 1.14.5__py3-none-any.whl → 1.15.0__py3-none-any.whl

devenv/checks/credsStore.py

@@ -19,9 +19,8 @@ def check() -> tuple[bool, str]:
     with open(os.path.expanduser("~/.docker/config.json"), "rb") as f:
         config = json.load(f)
 
-    if config.get("credsStore", "") == "desktop" and not shutil.which(
-        "docker-credential-desktop"
-    ):
+    store = config.get("credsStore", "")
+    if store and not shutil.which(f"docker-credential-{store}"):
         return False, "credsStore requires nonexistent binary"
 
     return True, ""

devenv/lib/venv.py

@@ -25,15 +25,20 @@ def get(
 
     venv = cfg[f"venv.{name}"]
     venv_dir = venv.get("path", f"{reporoot}/.venv-{name}")
-    editable_paths = venv.get("editable", None)
-    if editable_paths is not None:
+    editable_paths_s = venv.get("editable", None)
+    if editable_paths_s is not None:
         editable_paths = tuple(
-            f"{reporoot}/{path}" for path in editable_paths.strip().split("\n")
+            f"{reporoot}/{path}"
+            for path in editable_paths_s.strip().split("\n")
         )
-
-    bins = venv.get("bins", None)
-    if bins is not None:
-        bins = tuple(bins.strip().split("\n"))
+    else:
+        editable_paths = None
+
+    bins_s = venv.get("bins", None)
+    if bins_s is not None:
+        bins = tuple(bins_s.strip().split("\n"))
+    else:
+        bins = None
 
     return (
         venv_dir,

{sentry_devenv-1.14.5.dist-info → sentry_devenv-1.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sentry_devenv
-Version: 1.14.5
+Version: 1.15.0
 Summary: Utilities for setting up a Sentry development environment
 Author-email: Joshua Li <joshua.li@sentry.io>, Ian Woodard <ian.woodard@sentry.io>, Buck Evan <buck.evan@sentry.io>
 Classifier: Programming Language :: Python :: 3

{sentry_devenv-1.14.5.dist-info → sentry_devenv-1.15.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ devenv/pythons.py,sha256=ZcjBrkfmQEkiMP217VyTG48cyteJdYG_hoQ6oFKx_CU,1252
 devenv/sync.py,sha256=B9bvAuI7K-4SqcfHD4_zwKpozAnHWCNOL-IhVOcc3Zg,1254
 devenv/update.py,sha256=CkshQUvmVVblXdjARgWQKXSe7pwMjSMrPR3gDEesX5c,2402
 devenv/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devenv/checks/credsStore.py,sha256=z4XK8mEsFBdAs98rchijjxKcwv8gc9ft-2QqectqZVQ,1157
+devenv/checks/credsStore.py,sha256=eUwtoQ8btFsM8Ir-Vla98MEQFQ5o-OyFu--CSnZr3uY,1149
 devenv/checks/test.py,sha256=AvxoA2W5qTO2ZpoXmjScLiJxXD3Y_limYp5yTjGSZ9U,701
 devenv/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/lib/archive.py,sha256=LlVETRsf3J53yY_8sjL4P8plLNEMKoS9G48kfoVoseA,4503
@@ -33,7 +33,7 @@ devenv/lib/proc.py,sha256=eU7DHIk_66wgkHRmdtKbBKZTa6q4tl9QJbrlnQOQCls,2743
 devenv/lib/repository.py,sha256=cDCgcZ6lw0bcWC6DrcDp3tz_MWObmgAyFq39TeU7YHY,1966
 devenv/lib/rosetta.py,sha256=Lm-tDFut86o6l-Y55d5kTacRHTwrv5MFEymQpy7Qihc,1170
 devenv/lib/tenv.py,sha256=9-I-7wvJNqanaMEs39bheOfikVz3wgTKtArkeCsOz8I,3028
-devenv/lib/venv.py,sha256=9BK_3YjLpltDJby25eMmgZ_LQ7LVOkEFYxrStjtVUJk,3092
+devenv/lib/venv.py,sha256=VbV2IA3HTk5WABBpMQJvlizdknEQVz1SsLxlEBDOLkc,3186
 devenv/lib_check/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/lib_check/brew.py,sha256=tId1IgItju-fulbmTXmmI2Oo_-q332rd1tUN5RSkTrs,544
 devenv/lib_check/types.py,sha256=HIvuU3q27Izgm77jH6QX6gKMvgfunx05X4OEsJoqjP8,271
@@ -43,6 +43,8 @@ tests/test_main.py,sha256=S3IgdMIyUr1QWws_WQZcuXVEGU1GkOb3IiATUkfl9tc,657
 tests/test_pythons.py,sha256=Nepff11shv18irF3EYzf3U6zsRMrpLeS8QfrGJ3bTME,723
 tests/test_sync.py,sha256=ihCYFxscPwbVY_cnFyq2fvYUBc_SyB6gsElz334fmaw,871
 tests/utils.py,sha256=Qr2RM5Vo-14mF8tPSJITiYuhGc6fU9rk-fChxW-lokk,291
+tests/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/checks/test_credStore.py,sha256=fvvKBx2vqbHDAfwxz77GPHO_gc8jawkqOpaDOob1dEs,1459
 tests/doctor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/doctor/test_attempt_fix.py,sha256=cGUv7-xRKWCizC9cNNqiCp7aa95k3nHUXvRFFuLfJ34,1075
 tests/doctor/test_filter_failing_checks.py,sha256=5L5XdBSyeySwZtJeAR71lbktt3NxkJdUfncKBJPYdAc,1270
@@ -59,7 +61,7 @@ tests/doctor/devenv/checks/no_check.py,sha256=hcX2CNzB07U7r6KHbW71IvsW7UG-JsHcji
 tests/doctor/devenv/checks/no_name.py,sha256=txJhaXiJjY4CUPONTX9G6J6RttTCJ-BupDmZT1sKoAc,167
 tests/doctor/devenv/checks/no_tags.py,sha256=ATwlSsn5fe-OwNfgEDDa0HiBoOgkOGwkqIbQuDaghpk,161
 tests/doctor/devenv/checks/passing_check.py,sha256=F-gW4ZEqXVBL5akMaR3Hcf3yuihm3jfxTY80-EqsbOg,307
-tests/lib/test_archive.py,sha256=XuY26RiLZskUH-AL27rDAm9rHdR9hBzxeVTvRSnQvk8,7959
+tests/lib/test_archive.py,sha256=5FdCF8t64FewevL4P9PFojWS-a15z2I11TX0G1L_A-g,7944
 tests/lib/test_brew.py,sha256=g2Sz-yg4-212qlsKg0vfHf604bQyRjUElsf3khvXrTQ,5711
 tests/lib/test_direnv.py,sha256=GKpEbsHgaRZWevYrsa0oOGQFCsyllCLX1vGdg3igvAc,1551
 tests/lib/test_fs.py,sha256=qhX9CQTTSht1f6ZJfmpsSFICTwPs--h_mLlS_1jnZQg,1670
@@ -67,8 +69,8 @@ tests/lib/test_github.py,sha256=IMEG2cmRaK_PMJprFE_ZMqPnZ0StwWqgznhhT_zVk3U,4526
 tests/lib/test_proc.py,sha256=XH6OnxKPSSm3HvDjYHApputMKwgOE8lYqDuK2vK0Z0U,2626
 tests/lib/test_repository.py,sha256=gUi1lkY7bha5WwZ5xcnENOlFYboVV8TFW1lCESvS0VA,787
 tests/lib/test_venv.py,sha256=wscU7Enp8fK6o_2HgIT4WwDnvHbKwaKvJhNyJUrDNqk,3262
-sentry_devenv-1.14.5.dist-info/METADATA,sha256=f45SNpnD9CDOwfKer9EMO_sEYHh_gJRPQclfPin5ghc,13429
-sentry_devenv-1.14.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-sentry_devenv-1.14.5.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
-sentry_devenv-1.14.5.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
-sentry_devenv-1.14.5.dist-info/RECORD,,
+sentry_devenv-1.15.0.dist-info/METADATA,sha256=kJJJ8eaE-2p2yKdrYPZVr0vr-mcDHZBn9Jrep6XQYBM,13429
+sentry_devenv-1.15.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+sentry_devenv-1.15.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
+sentry_devenv-1.15.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
+sentry_devenv-1.15.0.dist-info/RECORD,,

{sentry_devenv-1.14.5.dist-info → sentry_devenv-1.15.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/checks/test_credStore.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+import os.path
+import pathlib
+import shutil
+from collections.abc import Generator
+from unittest import mock
+
+import pytest
+
+from devenv.checks import credsStore
+
+
+@pytest.fixture
+def fake_config(tmp_path: pathlib.Path) -> Generator[pathlib.Path]:
+    cfg = tmp_path.joinpath("config.json")
+
+    def new_expanduser(s: str) -> str:
+        assert s == "~/.docker/config.json"
+        return str(cfg)
+
+    with mock.patch.object(os.path, "expanduser", new_expanduser):
+        yield cfg
+
+
+def test_no_credsStore_ok(fake_config: pathlib.Path) -> None:
+    fake_config.write_text("{}")
+    assert credsStore.check() == (True, "")
+
+
+def test_binary_ok(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"credsStore": "example"}')
+    with mock.patch.object(shutil, "which", return_value="/fake/exe"):
+        assert credsStore.check() == (True, "")
+
+
+@pytest.mark.parametrize("name", ("desktop", "osxkeychain"))
+def test_binary_missing(fake_config: pathlib.Path, name: str) -> None:
+    fake_config.write_text(f'{{"credsStore": "{name}"}}')
+    with mock.patch.object(shutil, "which", return_value=None):
+        assert credsStore.check() == (
+            False,
+            "credsStore requires nonexistent binary",
+        )
+
+
+def test_fix(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"credsStore": "bad"}')
+    assert credsStore.fix() == (True, "")
+    assert fake_config.read_text() == "{}"

tests/lib/test_archive.py

@@ -20,7 +20,7 @@ def tar(tmp_path: pathlib.Path) -> pathlib.Path:
     executable.write_text("hi")
 
     tar = tmp_path / "tar"
-    with tarfile.open(tar, "w:tar") as tarf:
+    with tarfile.open(tar, "w:") as tarf:
         tarf.add(executable, arcname="executable")
 
     return tar
@@ -69,7 +69,7 @@ def tar2(tmp_path: pathlib.Path) -> pathlib.Path:
     foo_v1_baz.mkdir()
 
     tar = tmp_path / "tar"
-    with tarfile.open(tar, "w:tar") as tarf:
+    with tarfile.open(tar, "w:") as tarf:
         tarf.add(foo, arcname="foo")
         # foo
         # foo/v1
@@ -95,7 +95,7 @@ def tar3(tmp_path: pathlib.Path) -> pathlib.Path:
     foo_v1_foo.write_text("")
 
     tar = tmp_path / "tar"
-    with tarfile.open(tar, "w:tar") as tarf:
+    with tarfile.open(tar, "w:") as tarf:
         tarf.add(foo, arcname="foo")
         # foo
         # foo/bar
@@ -115,7 +115,7 @@ def tar4(tmp_path: pathlib.Path) -> pathlib.Path:
 
     tar = tmp_path / "tar"
 
-    with tarfile.open(tar, "w:tar") as tarf:
+    with tarfile.open(tar, "w:") as tarf:
         # note: arcname /foo doesn't work, it gets added as foo
         tarf.add(foo, arcname="foo")
         # /foo
@@ -139,7 +139,7 @@ def tar5(tmp_path: pathlib.Path) -> pathlib.Path:
 
     tar = tmp_path / "tar"
 
-    with tarfile.open(tar, "w:tar") as tarf:
+    with tarfile.open(tar, "w:") as tarf:
         tarf.add(foo, arcname="foo")
         # foo
         # foo/bar