devservices 1.0.13__tar.gz → 1.0.15__tar.gz

{devservices-1.0.13 → devservices-1.0.15}/PKG-INFO

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

{devservices-1.0.13 → devservices-1.0.15}/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.13
+devservices==1.0.15
 ```
 
 

{devservices-1.0.13 → devservices-1.0.15}/devservices/commands/update.py

@@ -36,7 +36,7 @@ def update_version(exec_path: str, latest_version: str) -> None:
 
 def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:
     parser = subparsers.add_parser(
-        "update", help="update devservices to the latest version"
+        "update", help="Update devservices to the latest version"
     )
     parser.set_defaults(func=update)
 

{devservices-1.0.13 → devservices-1.0.15}/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.13 → devservices-1.0.15}/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.13 → devservices-1.0.15}/devservices/utils/dependencies.py

@@ -272,6 +272,17 @@ def get_non_shared_remote_dependencies(
     active_services = starting_services.union(started_services)
     # We don't care about the remote dependencies of the service we are stopping
     active_services.remove(service_to_stop.name)
+
+    active_modes: dict[str, list[str]] = dict()
+    for active_service in active_services:
+        starting_modes = state.get_active_modes_for_service(
+            active_service, StateTables.STARTING_SERVICES
+        )
+        started_modes = state.get_active_modes_for_service(
+            active_service, StateTables.STARTED_SERVICES
+        )
+        active_modes[active_service] = starting_modes or started_modes
+
     other_running_remote_dependencies: set[InstalledRemoteDependency] = set()
     base_running_service_names: set[str] = set()
     for started_service_name in active_services:
@@ -279,8 +290,18 @@ def get_non_shared_remote_dependencies(
         for dependency_name in service_to_stop.config.dependencies.keys():
             if dependency_name == started_service.config.service_name:
                 base_running_service_names.add(started_service_name)
+
+        started_service_modes = active_modes[started_service_name]
+        # Only consider the dependencies of the modes that are running
+        started_service_dependencies: dict[str, Dependency] = dict()
+        for started_service_mode in started_service_modes:
+            for dependency_name in started_service.config.modes[started_service_mode]:
+                started_service_dependencies[
+                    dependency_name
+                ] = started_service.config.dependencies[dependency_name]
+
         installed_remote_dependencies = get_installed_remote_dependencies(
-            list(started_service.config.dependencies.values())
+            list(started_service_dependencies.values())
         )
         # TODO: There is an edge case here where there is a shared remote dependency with different modes
         other_running_remote_dependencies = other_running_remote_dependencies.union(
@@ -472,7 +493,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.13 → devservices-1.0.15}/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.15/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.13 → devservices-1.0.15}/devservices.egg-info/PKG-INFO

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

{devservices-1.0.13 → devservices-1.0.15}/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.13 → devservices-1.0.15}/pyproject.toml

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

{devservices-1.0.13 → devservices-1.0.15}/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
@@ -2157,6 +2164,8 @@ def test_get_non_shared_remote_dependencies_shared_dependencies(
         ),
     )
     assert len(shared_remote_dependencies) == 0
+    mock_find_matching_service.assert_called_once_with("service-2")
+    mock_get_installed_remote_dependencies.assert_called_once_with([])
 
 
 @mock.patch(
@@ -2179,8 +2188,25 @@ def test_get_non_shared_remote_dependencies_shared_dependencies(
         config=ServiceConfig(
             version=0.1,
             service_name="service-2",
-            dependencies={},
-            modes={"default": []},
+            dependencies={
+                "dependency-3": Dependency(
+                    description="dependency-3",
+                    remote=RemoteConfig(
+                        repo_name="dependency-3",
+                        repo_link="file://path/to/dependency-3",
+                        branch="main",
+                    ),
+                ),
+                "dependency-4": Dependency(
+                    description="dependency-4",
+                    remote=RemoteConfig(
+                        repo_name="dependency-4",
+                        repo_link="file://path/to/dependency-4",
+                        branch="main",
+                    ),
+                ),
+            },
+            modes={"default": ["dependency-3"], "other": ["dependency-4"]},
         ),
     ),
 )
@@ -2245,6 +2271,20 @@ def test_get_non_shared_remote_dependencies_complex(
             mode="default",
         )
     }
+    mock_find_matching_service.assert_called_once_with("service-2")
+    # dependency-4 is not installed, so it should not be passed to get_installed_remote_dependencies
+    mock_get_installed_remote_dependencies.assert_called_once_with(
+        [
+            Dependency(
+                description="dependency-3",
+                remote=RemoteConfig(
+                    repo_name="dependency-3",
+                    repo_link="file://path/to/dependency-3",
+                    branch="main",
+                ),
+            )
+        ]
+    )
 
 
 @mock.patch("devservices.utils.dependencies.install_dependencies", return_value=[])

{devservices-1.0.13 → devservices-1.0.15}/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.15/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
+    )