compose-runner 0.6.2__py2.py3-none-any.whl → 0.6.3rc1__py2.py3-none-any.whl

compose_runner/_version.py

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

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/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

{compose_runner-0.6.2.dist-info → compose_runner-0.6.3rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compose-runner
-Version: 0.6.2
+Version: 0.6.3rc1
 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.2.dist-info → compose_runner-0.6.3rc1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 compose_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-compose_runner/_version.py,sha256=RY8LE6fDgFr4EFmdDWXFpTFEh_gnhjqz0rKUDqEfQ3A,704
+compose_runner/_version.py,sha256=quCCOkavKBlc6rSAF6XdSp7szWQftVfjWzohYBDAHsQ,714
 compose_runner/cli.py,sha256=1tkxFgEe8Yk7VkzE8qxGmCGqLU7UbGin2VaP0AiZkVg,1101
-compose_runner/ecs_task.py,sha256=5-DbbcwfAqqkYRUuPADIlYatp5NK70uJYCo06O3IcdM,4997
+compose_runner/ecs_task.py,sha256=0s7pQvchNTSOvGNdp5qW7BFNjmIjzkApdZdHLK8rJEM,5154
 compose_runner/run.py,sha256=yIh8Fj8dfVKvahRl483qGOsDUoAS1FdsYrKZp_HknGo,18525
 compose_runner/sentry.py,sha256=pjqwsZrXrKB0cCy-TL-_2eYJIqUU0aV-8e0SWUk-9Xw,320
 compose_runner/aws_lambda/__init__.py,sha256=yZNXXv7gCPSrtLCEX5Qf4cnzSTS3fHPV6k-SyZwiZIA,48
@@ -12,6 +12,7 @@ compose_runner/aws_lambda/run_handler.py,sha256=iZW35xqa9FBZQTxRBH0JOpYhQ3Si1eTk
 compose_runner/aws_lambda/status_handler.py,sha256=K_VDyPYY3ExiyalDyf35nXi3UZzqj4AenWmlxkzWNXo,3423
 compose_runner/tests/conftest.py,sha256=ijb1iw724izKMxrvclt5x7LljTGoBfHwSS-jIEUe-sQ,191
 compose_runner/tests/test_cli.py,sha256=G3Kz7Nbl2voJ_luXPL7E6slkRNF9lmcpZ-nHBAqeL-M,290
+compose_runner/tests/test_ecs_task.py,sha256=kY_3mPXjUTiKlLMiJpCmNIQP7cWWw047aKVB8-Rr8Ws,463
 compose_runner/tests/test_lambda_handlers.py,sha256=A13q8KEMzxFPdqQYOIEqhYvEwKN1-3SPtGN9nRvLvtU,7115
 compose_runner/tests/test_run.py,sha256=Nhx7wz8XxQuxy3kT5yoE_S1Hw0Mgmfn8TWYOZXm1_Gg,1795
 compose_runner/tests/cassettes/test_run/test_download_bundle.yaml,sha256=vgdGDqirjBHosQsspkaN5Ty6XqJbkYUAbGtdImym5xI,79304
@@ -19,8 +20,8 @@ compose_runner/tests/cassettes/test_run/test_run_database_workflow.yaml,sha256=a
 compose_runner/tests/cassettes/test_run/test_run_group_comparison_workflow.yaml,sha256=FaZpMdcaM7TMgyueyZBGftm6ywUh1HhtGmCegXUmRFA,4029712
 compose_runner/tests/cassettes/test_run/test_run_string_group_comparison_workflow.yaml,sha256=pcn6tQwrimhDtP8yJ3jFlsfEOnk8FWybYQr9IQ5A_KA,3233839
 compose_runner/tests/cassettes/test_run/test_run_workflow.yaml,sha256=0Nk7eJWAmgYALG2ODrezbRhpYsc00JiuYVjXt3TUm5c,3857234
-compose_runner-0.6.2.dist-info/METADATA,sha256=RX0cbetMlDRXfYQJBz529rX2NHzHkwmNTLY4rqzgdMk,3432
-compose_runner-0.6.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-compose_runner-0.6.2.dist-info/entry_points.txt,sha256=TyPmB9o2tSWw8L3mcach9r2EL7inRVXE9ew3_XReMIY,55
-compose_runner-0.6.2.dist-info/licenses/LICENSE,sha256=PeiWxrrRme2rIpPMV9vjgGe7UHEKCIcTb0KagYhnyqo,1313
-compose_runner-0.6.2.dist-info/RECORD,,
+compose_runner-0.6.3rc1.dist-info/METADATA,sha256=FSuwB9boWnIHryFrtD9wP4JCd_7JP0w2dn1uCnIq5fM,3435
+compose_runner-0.6.3rc1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+compose_runner-0.6.3rc1.dist-info/entry_points.txt,sha256=TyPmB9o2tSWw8L3mcach9r2EL7inRVXE9ew3_XReMIY,55
+compose_runner-0.6.3rc1.dist-info/licenses/LICENSE,sha256=PeiWxrrRme2rIpPMV9vjgGe7UHEKCIcTb0KagYhnyqo,1313
+compose_runner-0.6.3rc1.dist-info/RECORD,,