devservices 1.0.14__tar.gz → 1.0.15__tar.gz

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

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

{devservices-1.0.14 → 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.14
+devservices==1.0.15
 ```
 
 

{devservices-1.0.14 → 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.14 → 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(

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

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

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

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

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

@@ -2164,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(
@@ -2186,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"]},
         ),
     ),
 )
@@ -2252,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=[])