sentry-devenv 1.18.0__py3-none-any.whl → 1.19.0__py3-none-any.whl

devenv/checks/credsStore.py

@@ -8,7 +8,7 @@ from devenv.lib_check.types import checker
 from devenv.lib_check.types import fixer
 
 tags: set[str] = {"builtin"}
-name = "credsStore"
+name = "credsStore fix"
 
 
 @checker

devenv/checks/dockerDesktop.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import time
+
+from devenv.lib import proc
+from devenv.lib_check.types import checker
+from devenv.lib_check.types import fixer
+
+tags: set[str] = {"builtin"}
+name = "docker desktop shouldn't be running"
+
+
+def docker_desktop_is_running() -> bool:
+    procs = proc.run(("/bin/ps", "-Ac", "-o", "comm"), stdout=True)
+    return "Docker Desktop" in procs.split("\n")
+
+
+@checker
+def check() -> tuple[bool, str]:
+    if docker_desktop_is_running():
+        return (
+            False,
+            "Docker Desktop is running. We don't support it, and it conflicts with colima.",
+        )
+
+    return True, ""
+
+
+@fixer
+def fix() -> tuple[bool, str]:
+    # regular pkill won't stop the Docker Desktop UI,
+    # it'll just spin. the proper way to terminate it
+    # without SIGKILL is to use osascript.
+    print("Attempting to stop Docker Desktop.")
+    try:
+        proc.run(("osascript", "-e", 'quit app "Docker Desktop"'))
+    except RuntimeError as e:
+        return False, f"failed to quit Docker Desktop:\n{e}\n"
+
+    # osascript doesn't wait to make sure it finishes quitting
+    # so let's block for up to 5 secs
+    for _ in range(10):
+        time.sleep(0.5)
+        if not docker_desktop_is_running():
+            return True, ""
+
+    return False, "Docker Desktop is taking too long to quit... try again?"

devenv/checks/limaDns.py

@@ -8,7 +8,7 @@ from devenv.lib_check.types import checker
 from devenv.lib_check.types import fixer
 
 tags: set[str] = {"builtin"}
-name = "limaDns"
+name = "colima's DNS isn't working"
 
 
 @checker
@@ -19,7 +19,7 @@ def check() -> tuple[bool, str]:
 
     status = colima.check()
     if status != colima.ColimaStatus.UP:
-        return False, "colima isn't up"
+        return False, "Colima isn't running."
 
     try:
         proc.run(

devenv/doctor.py

@@ -143,7 +143,7 @@ def run_checks(
     results: dict[Check, tuple[bool, str]] = {}
     for check in checks:
         if check in skip:
-            print(f"\t⏭️  Skipped {check.name}".expandtabs(4))
+            print(f"   ⏭️  Skipped {check.name}")
             continue
         futures[check] = executor.submit(check.check)
     for check, future in futures.items():
@@ -162,9 +162,9 @@ def filter_failing_checks(
     for check, result in results.items():
         ok, msg = result
         if ok:
-            print(f"\t✅ check: {check.name}".expandtabs(4))
+            print(f"   ✅ check: {check.name}")
             continue
-        print(f"\t❌ check: {check.name}{msg}".expandtabs(4))
+        print(f"   ❌ check: {check.name}\n   {msg}")
         failing_checks.append(check)
     return failing_checks
 
@@ -172,7 +172,7 @@ def filter_failing_checks(
 def prompt_for_fix(check: Check) -> bool:
     """Prompt the user to attempt a fix."""
     return input(
-        f"\t\tDo you want to attempt to fix {check.name}? (Y/n): ".expandtabs(4)
+        f"   Do you want to attempt to fix {check.name}? (Y/n): "
     ).lower() in {"y", "yes", ""}
 
 
@@ -229,19 +229,19 @@ def main(context: Context, argv: Sequence[str] | None = None) -> int:
         if args.check_only:
             return 1
 
-    print("\nThe following problems have been identified:")
     skip: list[Check] = []
+    print("\nLet's go through the failures one by one.")
     for check in failing_checks:
-        print(f"\t❌ {check.name}".expandtabs(4))
+        print(f"❌ {check.name}")
         # Prompt for fixes one by one, so the user can decide to skip a fix.
         if prompt_for_fix(check):
             ok, msg = attempt_fix(check, executor)
             if ok:
-                print(f"\t\t✅ fix: {check.name}".expandtabs(4))
+                print(f"✅ fix: {check.name}")
             else:
-                print(f"\t\t❌ fix: {check.name}{msg}".expandtabs(4))
+                print(f"❌ fix: {check.name}{msg}")
         else:
-            print(f"\t\t⏭️  Skipping {check.name}".expandtabs(4))
+            print(f"   ⏭️  Skipping {check.name}")
             skip.append(check)
 
     print("\nChecking that fixes worked as expected...")

{sentry_devenv-1.18.0.dist-info → sentry_devenv-1.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.18.0
+Version: 1.19.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.18.0.dist-info → sentry_devenv-1.19.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ devenv/__main__.py,sha256=O8ROZOx3emX7hhzMD608Ud_Pny_PCy5RsWXwBLhf8Q8,122
 devenv/bootstrap.py,sha256=VSlS1giUv8fE0K5pZgIO-QBKg5PsaWxirF6G9OPUUhE,4047
 devenv/colima.py,sha256=Dk9t6eu2DEoqqkY8xLmgiB96r-6zi3aXcvON3P8h1JQ,1537
 devenv/constants.py,sha256=wl0sRfkNeJL-sML6MG5nS0zU-dwRo1mDPrhUSHHY1YQ,1498
-devenv/doctor.py,sha256=VZlcX1GgIEUGTT4PX0phyWSx1UfI3uQbXsANpKVDTj0,8782
+devenv/doctor.py,sha256=tcwXrE2Y7Ued2gAXCXtfFkyXbG9DOi6jVobbq6DnuZs,8663
 devenv/fetch.py,sha256=MbztGFOzBR4KDPG0TVWcQsA4pGXk61zrQXvh-C9xHuk,3904
 devenv/main.py,sha256=JYV1GflML2DOrIhbZq_Vn89dFd0hqOKXxDVSd2GQRgY,3264
 devenv/pin_gha.py,sha256=t7A5CV1bnYRa4SAikuoJeodHuwV6moIePvhQ1Zdc1eE,2187
@@ -13,8 +13,9 @@ 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=eUwtoQ8btFsM8Ir-Vla98MEQFQ5o-OyFu--CSnZr3uY,1149
-devenv/checks/limaDns.py,sha256=yX0s63BR9OcX4TWtlywNlaS4NkrlFYj9W_vxX6NAFQg,1860
+devenv/checks/credsStore.py,sha256=G0mqzH62w4_3Tc4VG6tssGHFOUiVgp4RSPlYj86zsUc,1153
+devenv/checks/dockerDesktop.py,sha256=ynt8nNQ2DDT2rJDGZ-g7xxc4HErHJV_iqBqYHQtvA7Q,1343
+devenv/checks/limaDns.py,sha256=cHef2czdYYLvQqiM4bxiYtzYw4UVTIXJPwrGW2Kjpxo,1885
 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
@@ -51,7 +52,7 @@ tests/doctor/test_attempt_fix.py,sha256=cGUv7-xRKWCizC9cNNqiCp7aa95k3nHUXvRFFuLf
 tests/doctor/test_filter_failing_checks.py,sha256=5L5XdBSyeySwZtJeAR71lbktt3NxkJdUfncKBJPYdAc,1270
 tests/doctor/test_load_checks.py,sha256=C0uIdjftQZokZNYf003pNFfWuT9Gk1C7ALZzN_JnsWQ,2714
 tests/doctor/test_prompt_for_fix.py,sha256=dfFcdZnbkboB2-4vk1iyAHj7sCcsvM4AkBarnU8xBs8,1035
-tests/doctor/test_run_checks.py,sha256=2sJEvV3FsSa1HCwgVId-Tg8sn1GSR1tn5hcvO72n01U,2321
+tests/doctor/test_run_checks.py,sha256=t03x6ICUPuceTcHUQKBMRTrr0VzRORv9_hZwcnm2v08,2320
 tests/doctor/devenv/checks/bad_check.py,sha256=uohSVSUMnZmj0eFXEwCOHBzCJN6cdjv2hm6_u9ZMEFw,336
 tests/doctor/devenv/checks/bad_fix.py,sha256=dQqUumOOw-YhnbweMXYKeYQFVh1CXZzGMDsO73Uv16Y,335
 tests/doctor/devenv/checks/broken_check.py,sha256=dutNCmaB6COeu8VPMcR_r5hw9Zud0lOXfQG1a5sg8-o,383
@@ -70,8 +71,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.18.0.dist-info/METADATA,sha256=2yYNwF0Iz9QTxXw0dnucRef4B0hIpcil88QzTqs6uf4,13622
-sentry_devenv-1.18.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-sentry_devenv-1.18.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
-sentry_devenv-1.18.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
-sentry_devenv-1.18.0.dist-info/RECORD,,
+sentry_devenv-1.19.0.dist-info/METADATA,sha256=I9mqOnTg4iM8ffcjIKb-grNlcw2KrQCQph6WUzMK5fI,13622
+sentry_devenv-1.19.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+sentry_devenv-1.19.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
+sentry_devenv-1.19.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
+sentry_devenv-1.19.0.dist-info/RECORD,,

{sentry_devenv-1.18.0.dist-info → sentry_devenv-1.19.0.dist-info}/WHEEL

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

tests/doctor/test_run_checks.py

@@ -51,7 +51,7 @@ def test_run_checks_skip(capsys: pytest.CaptureFixture[str]) -> None:
         [first_check, second_check], ThreadPoolExecutor(), skip=[second_check]
     ) == {first_check: (True, "")}
     captured = capsys.readouterr()
-    assert captured.out == "    ⏭️  Skipped failing check\n"
+    assert captured.out == "   ⏭️  Skipped failing check\n"
 
 
 def test_run_checks_multiple_failing_checks() -> None: