compose-runner 0.6.2rc1__tar.gz → 0.6.3__tar.gz

{compose_runner-0.6.2rc1 → compose_runner-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compose-runner
-Version: 0.6.2rc1
+Version: 0.6.3
 Summary: A package for running neurosynth-compose analyses
 Project-URL: Repository, https://github.com/neurostuff/compose-runner
 Author-email: James Kent <jamesdkent21@gmail.com>

{compose_runner-0.6.2rc1 → compose_runner-0.6.3}/compose_runner/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.6.2rc1'
-__version_tuple__ = version_tuple = (0, 6, 2, 'rc1')
+__version__ = version = '0.6.3'
+__version_tuple__ = version_tuple = (0, 6, 3)
 
 __commit_id__ = commit_id = None

{compose_runner-0.6.2rc1 → compose_runner-0.6.3}/compose_runner/ecs_task.py

@@ -73,6 +73,13 @@ def _bool_from_env(value: Optional[str]) -> bool:
     return value.lower() in {"1", "true", "t", "yes", "y"}
 
 
+def _resolve_n_cores(env_value: Optional[str]) -> Optional[int]:
+    if env_value:
+        return int(env_value)
+    detected_cores = os.cpu_count()
+    return detected_cores if detected_cores else None
+
+
 def main() -> None:
     if ARTIFACT_PREFIX_ENV not in os.environ:
         raise RuntimeError(f"{ARTIFACT_PREFIX_ENV} environment variable must be set.")
@@ -85,8 +92,7 @@ def main() -> None:
     nsc_key = os.environ.get(NSC_KEY_ENV) or None
     nv_key = os.environ.get(NV_KEY_ENV) or None
     no_upload = _bool_from_env(os.environ.get(NO_UPLOAD_ENV))
-    n_cores_value = os.environ.get(N_CORES_ENV)
-    n_cores = int(n_cores_value) if n_cores_value else None
+    n_cores = _resolve_n_cores(os.environ.get(N_CORES_ENV))
 
     bucket = os.environ.get(RESULTS_BUCKET_ENV)
     prefix = os.environ.get(RESULTS_PREFIX_ENV)

compose_runner-0.6.3/compose_runner/tests/test_ecs_task.py

@@ -0,0 +1,15 @@
+from compose_runner import ecs_task
+
+
+def test_resolve_n_cores_prefers_env():
+    assert ecs_task._resolve_n_cores("3") == 3
+
+
+def test_resolve_n_cores_detects_cpu(monkeypatch):
+    monkeypatch.setattr(ecs_task.os, "cpu_count", lambda: 4)
+    assert ecs_task._resolve_n_cores(None) == 4
+
+
+def test_resolve_n_cores_handles_unknown_cpu(monkeypatch):
+    monkeypatch.setattr(ecs_task.os, "cpu_count", lambda: None)
+    assert ecs_task._resolve_n_cores(None) is None