sentry-devenv 1.14.5__tar.gz → 1.15.0__tar.gz

{sentry_devenv-1.14.5 → sentry_devenv-1.15.0}/PKG-INFO

@@ -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 → sentry_devenv-1.15.0}/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, ""

{sentry_devenv-1.14.5 → sentry_devenv-1.15.0}/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 → sentry_devenv-1.15.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sentry_devenv"
-version = "1.14.5"
+version = "1.15.0"
 authors = [
   { name="Joshua Li", email="joshua.li@sentry.io" },
   { name="Ian Woodard", email="ian.woodard@sentry.io" },

{sentry_devenv-1.14.5 → sentry_devenv-1.15.0}/sentry_devenv.egg-info/PKG-INFO

@@ -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 → sentry_devenv-1.15.0}/sentry_devenv.egg-info/SOURCES.txt

@@ -52,6 +52,8 @@ tests/test_main.py
 tests/test_pythons.py
 tests/test_sync.py
 tests/utils.py
+tests/checks/__init__.py
+tests/checks/test_credStore.py
 tests/doctor/__init__.py
 tests/doctor/test_attempt_fix.py
 tests/doctor/test_filter_failing_checks.py

sentry_devenv-1.15.0/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() == "{}"

{sentry_devenv-1.14.5 → sentry_devenv-1.15.0}/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