devservices 1.0.12__tar.gz → 1.0.14__tar.gz

{devservices-1.0.12 → devservices-1.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: devservices
-Version: 1.0.12
+Version: 1.0.14
 Requires-Python: >=3.10
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.0.12 → devservices-1.0.14}/README.md

@@ -11,7 +11,7 @@ A standalone cli tool used to manage dependencies for services. It simplifies th
 The recommended way to install devservices is through a virtualenv in the requirements.txt.
 
 ```
-devservices==1.0.12
+devservices==1.0.14
 ```
 
 

{devservices-1.0.12 → devservices-1.0.14}/devservices/constants.py

@@ -37,5 +37,6 @@ DEVSERVICES_LATEST_VERSION_CACHE_FILE = os.path.join(
     DEVSERVICES_CACHE_DIR, "latest_version.txt"
 )
 DEVSERVICES_LATEST_VERSION_CACHE_TTL = timedelta(minutes=15)
-HEALTHCHECK_TIMEOUT = 45
+# Healthcheck timeout set to 2 minutes to account for slow healthchecks
+HEALTHCHECK_TIMEOUT = 120
 HEALTHCHECK_INTERVAL = 5

{devservices-1.0.12 → devservices-1.0.14}/devservices/exceptions.py

@@ -123,6 +123,15 @@ class DependencyNotInstalledError(DependencyError):
         return f"Dependency not installed correctly: {self.repo_name} ({self.repo_link}) on {self.branch}"
 
 
+class GitError(Exception):
+    """Base class for git related errors."""
+
+    def __init__(self, command: str, returncode: int, stderr: str):
+        self.command = command
+        self.returncode = returncode
+        self.stderr = stderr
+
+
 class GitConfigError(Exception):
     """Base class for git config related errors."""
 

{devservices-1.0.12 → devservices-1.0.14}/devservices/main.py

@@ -5,6 +5,7 @@ import atexit
 import getpass
 import logging
 import os
+import platform
 from importlib import metadata
 
 from sentry_sdk import capture_exception
@@ -26,14 +27,18 @@ from devservices.commands import update
 from devservices.constants import LOGGER_NAME
 from devservices.exceptions import DockerComposeInstallationError
 from devservices.exceptions import DockerDaemonNotRunningError
+from devservices.exceptions import GitError
 from devservices.utils.console import Console
 from devservices.utils.docker_compose import check_docker_compose_version
+from devservices.utils.git import get_git_version
 
 sentry_environment = (
-    "development" if os.environ.get("IS_DEV", default=False) else "production"
+    "development" if os.environ.get("IS_DEV", default="0") == "1" else "production"
 )
+if os.environ.get("CI", default="false") == "true":
+    sentry_environment = "CI"
 
-disable_sentry = os.environ.get("DEVSERVICES_DISABLE_SENTRY", default=False)
+disable_sentry = os.environ.get("DEVSERVICES_DISABLE_SENTRY", default="0") == "1"
 logging.basicConfig(level=logging.INFO)
 current_version = metadata.version("devservices")
 
@@ -49,6 +54,14 @@ if not disable_sentry:
     )
     username = getpass.getuser()
     set_user({"username": username})
+    set_tag("platform", platform.platform())
+    try:
+        git_version = get_git_version()
+        set_tag("git_version", git_version)
+    except GitError as e:
+        capture_exception(e)
+        logging.debug("Failed to get git version: %s", e)
+        set_tag("git_version", "unknown")
 
 
 @atexit.register

{devservices-1.0.12 → devservices-1.0.14}/devservices/utils/dependencies.py

@@ -472,7 +472,14 @@ def _update_dependency(
 
     try:
         _run_command_with_retries(
-            ["git", "fetch", "origin", dependency.branch, "--filter=blob:none"],
+            [
+                "git",
+                "fetch",
+                "origin",
+                dependency.branch,
+                "--filter=blob:none",
+                "--no-recurse-submodules",  # Avoid fetching submodules
+            ],
             cwd=dependency_repo_dir,
         )
     except subprocess.CalledProcessError as e:

{devservices-1.0.12 → devservices-1.0.14}/devservices/utils/docker_compose.py

@@ -84,7 +84,10 @@ def install_docker_compose() -> None:
     # Verify the installation
     try:
         version = subprocess.run(
-            ["docker", "compose", "version", "--short"], capture_output=True, text=True
+            ["docker", "compose", "version", "--short"],
+            capture_output=True,
+            check=True,
+            text=True,
         ).stdout
     except Exception as e:
         raise DockerComposeInstallationError(

devservices-1.0.14/devservices/utils/git.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+import subprocess
+
+from devservices.exceptions import GitError
+
+
+def get_git_version() -> str:
+    """Get the git version"""
+    try:
+        return subprocess.check_output(
+            ["git", "version"],
+            text=True,
+            stderr=subprocess.PIPE,
+        ).strip()
+    except subprocess.CalledProcessError as e:
+        raise GitError(
+            command="git --version",
+            returncode=e.returncode,
+            stderr=e.stderr,
+        ) from e

{devservices-1.0.12 → devservices-1.0.14}/devservices.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: devservices
-Version: 1.0.12
+Version: 1.0.14
 Requires-Python: >=3.10
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.0.12 → devservices-1.0.14}/devservices.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ devservices/utils/devenv.py
 devservices/utils/docker.py
 devservices/utils/docker_compose.py
 devservices/utils/file_lock.py
+devservices/utils/git.py
 devservices/utils/install_binary.py
 devservices/utils/services.py
 devservices/utils/state.py
@@ -50,6 +51,7 @@ tests/utils/test_check_for_update.py
 tests/utils/test_dependencies.py
 tests/utils/test_docker.py
 tests/utils/test_docker_compose.py
+tests/utils/test_git.py
 tests/utils/test_install_binary.py
 tests/utils/test_services.py
 tests/utils/test_state.py

{devservices-1.0.12 → devservices-1.0.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devservices"
-version = "1.0.12"
+version = "1.0.14"
 # 3.10 is just for internal pypi compat
 requires-python = ">=3.10"
 dependencies = [

{devservices-1.0.12 → devservices-1.0.14}/tests/commands/test_up.py

@@ -556,7 +556,7 @@ def test_up_docker_compose_container_healthcheck_failed(
         assert "Starting clickhouse" in captured.out.strip()
         assert "Starting redis" in captured.out.strip()
         assert (
-            "Container container1 did not become healthy within 45 seconds."
+            "Container container1 did not become healthy within 120 seconds."
             in captured.out.strip()
         )
 

{devservices-1.0.12 → devservices-1.0.14}/tests/utils/test_dependencies.py

@@ -681,6 +681,7 @@ def test_install_dependency_git_fetch_transient_failure(tmp_path: Path) -> None:
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path
@@ -697,6 +698,7 @@ def test_install_dependency_git_fetch_transient_failure(tmp_path: Path) -> None:
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path
@@ -713,6 +715,7 @@ def test_install_dependency_git_fetch_transient_failure(tmp_path: Path) -> None:
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path
@@ -800,6 +803,7 @@ def test_install_dependency_git_fetch_failure_with_retries(tmp_path: Path) -> No
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path
@@ -816,6 +820,7 @@ def test_install_dependency_git_fetch_failure_with_retries(tmp_path: Path) -> No
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path
@@ -832,6 +837,7 @@ def test_install_dependency_git_fetch_failure_with_retries(tmp_path: Path) -> No
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path
@@ -919,6 +925,7 @@ def test_install_dependency_update_git_checkout_failure(tmp_path: Path) -> None:
                         "origin",
                         "main",
                         "--filter=blob:none",
+                        "--no-recurse-submodules",
                     ],
                     cwd=str(
                         tmp_path

{devservices-1.0.12 → devservices-1.0.14}/tests/utils/test_docker_compose.py

@@ -192,7 +192,10 @@ def test_install_docker_compose_macos_arm64(
         os.path.expanduser("~/.docker/cli-plugins/docker-compose"),
     )
     mock_subprocess_run.assert_called_once_with(
-        ["docker", "compose", "version", "--short"], capture_output=True, text=True
+        ["docker", "compose", "version", "--short"],
+        capture_output=True,
+        check=True,
+        text=True,
     )
 
 
@@ -231,7 +234,10 @@ def test_install_docker_compose_linux_x86(
         os.path.expanduser("~/.docker/cli-plugins/docker-compose"),
     )
     mock_subprocess_run.assert_called_once_with(
-        ["docker", "compose", "version", "--short"], capture_output=True, text=True
+        ["docker", "compose", "version", "--short"],
+        capture_output=True,
+        check=True,
+        text=True,
     )
 
 

devservices-1.0.14/tests/utils/test_git.py

@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+import subprocess
+from unittest import mock
+
+import pytest
+
+from devservices.exceptions import GitError
+from devservices.utils.git import get_git_version
+
+
+@mock.patch(
+    "devservices.utils.git.subprocess.check_output", return_value="git version 2.42.0"
+)
+def test_get_git_version_success(mock_get_git_version: mock.Mock) -> None:
+    assert get_git_version() == "git version 2.42.0"
+    mock_get_git_version.assert_called_once_with(
+        ["git", "version"], text=True, stderr=subprocess.PIPE
+    )
+
+
+@mock.patch(
+    "devservices.utils.git.subprocess.check_output",
+    side_effect=subprocess.CalledProcessError(
+        returncode=1, cmd="git version", stderr="error"
+    ),
+)
+def test_get_git_version_error(mock_get_git_version: mock.Mock) -> None:
+    with pytest.raises(GitError):
+        get_git_version()
+    mock_get_git_version.assert_called_once_with(
+        ["git", "version"], text=True, stderr=subprocess.PIPE
+    )