sentry-devenv 1.22.0__tar.gz → 1.22.2__tar.gz

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.22.0
+Version: 1.22.2
 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
@@ -170,7 +170,7 @@ if using uv:
 
 `[reporoot]/devenv/sync.py`
 ```py
-from devenv.lib import uv
+from devenv.lib import config, uv
 
 def main(context: dict[str, str]) -> int:
     reporoot = context["reporoot"]
@@ -192,6 +192,9 @@ def main(context: dict[str, str]) -> int:
 
 `[reporoot]/devenv/config.ini`
 ```ini
+[devenv]
+minimum_version = 1.22.1
+
 [uv]
 darwin_arm64 = https://github.com/astral-sh/uv/releases/download/0.7.21/uv-aarch64-apple-darwin.tar.gz
 darwin_arm64_sha256 = c73af7a4e0bcea9b5b593a0c7e5c025ee78d8be3f7cd60bfeadc8614a16c92ef

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/README.md

@@ -157,7 +157,7 @@ if using uv:
 
 `[reporoot]/devenv/sync.py`
 ```py
-from devenv.lib import uv
+from devenv.lib import config, uv
 
 def main(context: dict[str, str]) -> int:
     reporoot = context["reporoot"]
@@ -179,6 +179,9 @@ def main(context: dict[str, str]) -> int:
 
 `[reporoot]/devenv/config.ini`
 ```ini
+[devenv]
+minimum_version = 1.22.1
+
 [uv]
 darwin_arm64 = https://github.com/astral-sh/uv/releases/download/0.7.21/uv-aarch64-apple-darwin.tar.gz
 darwin_arm64_sha256 = c73af7a4e0bcea9b5b593a0c7e5c025ee78d8be3f7cd60bfeadc8614a16c92ef

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/devenv/checks/dockerConfig.py

@@ -32,6 +32,14 @@ def check() -> tuple[bool, str]:
             "cliPluginsExtraDirs exists, which overshadows the default plugin path",
         )
 
+    # Ensure the current context is set to colima
+    current_context = config.get("currentContext", "")
+    if current_context != "colima":
+        return (
+            False,
+            f"currentContext is '{current_context}', should be 'colima'",
+        )
+
     return True, ""
 
 
@@ -43,6 +51,7 @@ def fix() -> tuple[bool, str]:
 
         config.pop("credsStore", None)
         config.pop("cliPluginsExtraDirs", None)
+        config["currentContext"] = "colima"
 
         with open(os.path.expanduser("~/.docker/config.json"), "w") as f:
             json.dump(config, f)

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/devenv/update.py

@@ -55,7 +55,7 @@ Updating global tools (at {constants.root}/bin).
         if args.version is None:
             version = "sentry-devenv"
         else:
-            version = "sentry-devenv=={args.version}"
+            version = f"sentry-devenv=={args.version}"
 
         proc.run(
             (f"{constants.root}/venv/bin/pip", "install", "-U", version),

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/pyproject.toml

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

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/sentry_devenv.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.22.0
+Version: 1.22.2
 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
@@ -170,7 +170,7 @@ if using uv:
 
 `[reporoot]/devenv/sync.py`
 ```py
-from devenv.lib import uv
+from devenv.lib import config, uv
 
 def main(context: dict[str, str]) -> int:
     reporoot = context["reporoot"]
@@ -192,6 +192,9 @@ def main(context: dict[str, str]) -> int:
 
 `[reporoot]/devenv/config.ini`
 ```ini
+[devenv]
+minimum_version = 1.22.1
+
 [uv]
 darwin_arm64 = https://github.com/astral-sh/uv/releases/download/0.7.21/uv-aarch64-apple-darwin.tar.gz
 darwin_arm64_sha256 = c73af7a4e0bcea9b5b593a0c7e5c025ee78d8be3f7cd60bfeadc8614a16c92ef

{sentry_devenv-1.22.0 → sentry_devenv-1.22.2}/tests/checks/test_dockerConfig.py

@@ -24,12 +24,14 @@ def fake_config(tmp_path: pathlib.Path) -> Generator[pathlib.Path]:
 
 
 def test_no_credsStore_ok(fake_config: pathlib.Path) -> None:
-    fake_config.write_text("{}")
+    fake_config.write_text('{"currentContext": "colima"}')
     assert dockerConfig.check() == (True, "")
 
 
 def test_binary_ok(fake_config: pathlib.Path) -> None:
-    fake_config.write_text('{"credsStore": "example"}')
+    fake_config.write_text(
+        '{"credsStore": "example", "currentContext": "colima"}'
+    )
     with mock.patch.object(shutil, "which", return_value="/fake/exe"):
         assert dockerConfig.check() == (True, "")
 
@@ -47,10 +49,45 @@ def test_binary_missing(fake_config: pathlib.Path, name: str) -> None:
 def test_fix_credsStore(fake_config: pathlib.Path) -> None:
     fake_config.write_text('{"credsStore": "bad"}')
     assert dockerConfig.fix() == (True, "")
-    assert fake_config.read_text() == "{}"
+    assert fake_config.read_text() == '{"currentContext": "colima"}'
 
 
 def test_fix_cliPluginsExtraDirs(fake_config: pathlib.Path) -> None:
     fake_config.write_text('{"cliPluginsExtraDirs": ["foo/"]}')
     assert dockerConfig.fix() == (True, "")
-    assert fake_config.read_text() == "{}"
+    assert fake_config.read_text() == '{"currentContext": "colima"}'
+
+
+def test_currentContext_missing(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"auths": {}}')
+    assert dockerConfig.check() == (
+        False,
+        "currentContext is '', should be 'colima'",
+    )
+
+
+def test_currentContext_wrong(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"currentContext": "desktop"}')
+    assert dockerConfig.check() == (
+        False,
+        "currentContext is 'desktop', should be 'colima'",
+    )
+
+
+def test_currentContext_correct(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"currentContext": "colima"}')
+    assert dockerConfig.check() == (True, "")
+
+
+def test_fix_currentContext_missing(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"auths": {}}')
+    assert dockerConfig.fix() == (True, "")
+    assert (
+        fake_config.read_text() == '{"auths": {}, "currentContext": "colima"}'
+    )
+
+
+def test_fix_currentContext_wrong(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"currentContext": "docker-desktop"}')
+    assert dockerConfig.fix() == (True, "")
+    assert fake_config.read_text() == '{"currentContext": "colima"}'