sentry-devenv 1.14.5__py3-none-any.whl → 1.16.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/colima.py

@@ -57,14 +57,14 @@ exec {binroot}/colima-bin "$@"
 
 
 def install_global() -> None:
-    version = "v0.7.5"
+    version = "v0.8.1"
     cfg = {
         "darwin_x86_64": f"https://github.com/abiosoft/colima/releases/download/{version}/colima-Darwin-x86_64",
-        "darwin_x86_64_sha256": "53f78b4aaef5fb5dab65cae19fba4504047de1fdafa152fba90435d8a7569c2b",
+        "darwin_x86_64_sha256": "791330c62c60389f70e5e1c33a56c35502a9e36e544a418daea0273e539acbf4",
         "darwin_arm64": f"https://github.com/abiosoft/colima/releases/download/{version}/colima-Darwin-arm64",
-        "darwin_arm64_sha256": "267696d6cb28eaf6daa3ea9622c626697b4baeb847b882d15b26c732e841913c",
-        "linux_x86_64": "https://github.com/abiosoft/colima/releases/download/v0.7.5/colima-Linux-x86_64",
-        "linux_x86_64_sha256": "a3d440033776b2fb0cdd6139a2dbebf6764aabf78a671d4aa13b45c26df21a8a",
+        "darwin_arm64_sha256": "c266fcb272b39221ef6152d2093bb02a1ebadc26042233ad359e1ae52d5d5922",
+        "linux_x86_64": f"https://github.com/abiosoft/colima/releases/download/{version}/colima-Linux-x86_64",
+        "linux_x86_64_sha256": "f2d6664a79ff3aa35f0718aac2ba9f6b531772e1464f3b096c1ac2aab404943e",
     }
 
     binroot = f"{root}/bin"

devenv/lib/limactl.py

@@ -62,17 +62,23 @@ def _install(url: str, sha256: str, into: str) -> None:
 
 
 def install_global() -> None:
-    version = "0.23.2"
+    version = "1.0.3"
     cfg = {
-        # upstream github releases aren't built for macOS 14, so we use homebrew binaries
-        "darwin_x86_64": "https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:c2e69a572afa3a3cf895643ede988c87dc0622dae4aebc539d5564d820845841",
-        "darwin_x86_64_sha256": "c2e69a572afa3a3cf895643ede988c87dc0622dae4aebc539d5564d820845841",
-        "darwin_arm64": "https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:be8e2b92961eca2f862f1a994dbef367e86d36705a705ebfa16d21c7f1366c35",
-        "darwin_arm64_sha256": "be8e2b92961eca2f862f1a994dbef367e86d36705a705ebfa16d21c7f1366c35",
+        # upstream github releases aren't built for macOS 14, so for now
+        # we use homebrew binaries from https://formulae.brew.sh/api/formula/lima.json
+        # unfortunately there's no way to view previous versions of a formula
+        # so if we ever need to upgrade to a specific non-latest version we'll
+        # have to build it ourselves
+        # sonoma
+        "darwin_x86_64": "https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:f675abee28d0f10f335f7a04dc6ad3de12434c83c2f0f32c913061204c137a94",
+        "darwin_x86_64_sha256": "f675abee28d0f10f335f7a04dc6ad3de12434c83c2f0f32c913061204c137a94",
+        # arm64_sonoma
+        "darwin_arm64": "https://ghcr.io/v2/homebrew/core/lima/blobs/sha256:8aeb0a3b7295f0c3e0c2a7a92a798a44397936e5bb732db825aee6da5e762d7a",
+        "darwin_arm64_sha256": "8aeb0a3b7295f0c3e0c2a7a92a798a44397936e5bb732db825aee6da5e762d7a",
         # on linux we use github releases since most people are probably not using
-        # linuxbrew and the go binary in homebrew links to homebrew's ld.so
-        "linux_x86_64": "https://github.com/lima-vm/lima/releases/download/v0.23.2/lima-0.23.2-Linux-x86_64.tar.gz",
-        "linux_x86_64_sha256": "5d0034316096e3f3ceedcb2e1dcac7c7d380e26defb59a5894eaf1e3265b191e",
+        # linuxbrew and the go binary in homebrew links to linuxbrew's ld.so
+        "linux_x86_64": f"https://github.com/lima-vm/lima/releases/download/v{version}/lima-{version}-Linux-x86_64.tar.gz",
+        "linux_x86_64_sha256": "b109cac29569a4aacab01c588f922ea6c7e2ef06ce9260bbc4c382e475bc3b98",
     }
 
     binroot = f"{root}/bin"

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.16.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.16.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
@@ -30,9 +30,12 @@ Otherwise, set the `SENTRY_EXTERNAL_CONTRIBUTOR` environment variable.
 Download [this](https://raw.githubusercontent.com/getsentry/devenv/main/install-devenv.sh) and run it:
 
 ```
+curl https://raw.githubusercontent.com/getsentry/devenv/main/install-devenv.sh > install-devenv.sh
 bash install-devenv.sh
 ```
 
+Make sure to call this file `install-devenv.sh` as the script calls itself when you run it.
+
 This "global" devenv is installed to `~/.local/share/sentry-devenv/bin/devenv`.
 
 To update this installation, run `devenv update`.

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

@@ -13,12 +13,12 @@ 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
 devenv/lib/brew.py,sha256=_7recvYh-LnUJC0eKnYK7F8AzGRL5bi_Khv0f_mgrlM,1795
-devenv/lib/colima.py,sha256=_im7bcaJeZbbw1xw7zK7eLwJEvlhO5rOiXT7qkXsvLE,6836
+devenv/lib/colima.py,sha256=fcCnH6H1uZnSPG28tt9dQZXgLZPvKTfiQynw6Ty137M,6840
 devenv/lib/config.py,sha256=5eXYwM44AJ3w2VfVbCDqchYOL1zAjazNcirtM6kxxGw,3344
 devenv/lib/context.py,sha256=4EDImK9pvTp3FqeNigevC9lbJsgdDO9D1t2_Y4NyPlc,207
 devenv/lib/direnv.py,sha256=HDRUaIR0PMAQYiiTaw3gEQuh6Tdb7BUJmV7dBZdPztM,1325
@@ -26,14 +26,14 @@ devenv/lib/docker.py,sha256=vfEThxKqQGrGPPUZvw5yo2IZ25XG_HoUYjDyBPHnIN4,3480
 devenv/lib/fs.py,sha256=IBahQ9fB-o9cK9HipK_L0gso2OVinIDTxFWoeMte9ww,2764
 devenv/lib/gcloud.py,sha256=G8rhKC89TqWcFzIVsFd64d4ouD6M6s-TaMX5ZxtKypw,3550
 devenv/lib/github.py,sha256=AMtcz6gTVKy7qvCP1zTUdHQlnSM32TVaji0aOXJ_F9A,3463
-devenv/lib/limactl.py,sha256=HHUsS4lpnXzf2xQd6syMs5PgSQqOylrz1gFsJ34HRfk,3943
+devenv/lib/limactl.py,sha256=uGcRkXQACDvbwKWhgEqgoUSVZjX6vEUGOutJDEw3kNM,4254
 devenv/lib/modules.py,sha256=shoqgja0b-xzXr601Ryz0JOy3Vxbw53I3cRYezVt77g,859
 devenv/lib/node.py,sha256=0LobIBWRQMzBiTKgv-WCva0Q1ZK3sR2NXNmnSa0Pcow,4156
 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.16.0.dist-info/METADATA,sha256=XtKwpwoQvjbWUcMYCrUrhEutRyZWwBV-JP6zJeBV6l4,13621
+sentry_devenv-1.16.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+sentry_devenv-1.16.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
+sentry_devenv-1.16.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
+sentry_devenv-1.16.0.dist-info/RECORD,,

{sentry_devenv-1.14.5.dist-info → sentry_devenv-1.16.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