compose-runner 0.6.4rc1__tar.gz → 0.6.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/PKG-INFO +1 -1
  2. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/_version.py +2 -2
  3. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/run.py +4 -0
  4. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/.gitignore +0 -0
  5. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/Dockerfile +0 -0
  6. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/LICENSE +0 -0
  7. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/README.md +0 -0
  8. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/aws_lambda/.dockerignore +0 -0
  9. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/aws_lambda/Dockerfile +0 -0
  10. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/__init__.py +0 -0
  11. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/aws_lambda/__init__.py +0 -0
  12. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/aws_lambda/common.py +0 -0
  13. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/aws_lambda/log_poll_handler.py +0 -0
  14. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/aws_lambda/results_handler.py +0 -0
  15. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/aws_lambda/run_handler.py +0 -0
  16. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/aws_lambda/status_handler.py +0 -0
  17. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/cli.py +0 -0
  18. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/ecs_task.py +0 -0
  19. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/sentry.py +0 -0
  20. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_lambda_handlers/test_select_task_size_uses_large_for_montecarlo.yaml +0 -0
  21. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_lambda_handlers/test_select_task_size_uses_standard_for_fdr.yaml +0 -0
  22. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_run/test_download_bundle.yaml +0 -0
  23. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_run/test_run_database_workflow.yaml +0 -0
  24. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_run/test_run_group_comparison_workflow.yaml +0 -0
  25. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_run/test_run_string_group_comparison_workflow.yaml +0 -0
  26. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/cassettes/test_run/test_run_workflow.yaml +0 -0
  27. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/conftest.py +0 -0
  28. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/test_cli.py +0 -0
  29. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/test_ecs_task.py +0 -0
  30. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/test_lambda_handlers.py +0 -0
  31. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/tests/test_run.py +0 -0
  32. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/infra/cdk/app.py +0 -0
  33. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/infra/cdk/cdk.json +0 -0
  34. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/infra/cdk/requirements.txt +0 -0
  35. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/infra/cdk/stacks/__init__.py +0 -0
  36. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/infra/cdk/stacks/compose_runner_stack.py +0 -0
  37. {compose_runner-0.6.4rc1 → compose_runner-0.6.5}/pyproject.toml +0 -0
{compose_runner-0.6.4rc1 → compose_runner-0.6.5}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: compose-runner
3
- Version: 0.6.4rc1
3
+ Version: 0.6.5
4
4
  Summary: A package for running neurosynth-compose analyses
5
5
  Project-URL: Repository, https://github.com/neurostuff/compose-runner
6
6
  Author-email: James Kent <jamesdkent21@gmail.com>
{compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/_version.py RENAMED
@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
28
28
  commit_id: COMMIT_ID
29
29
  __commit_id__: COMMIT_ID
30
30
 
31
- __version__ = version = '0.6.4rc1'
32
- __version_tuple__ = version_tuple = (0, 6, 4, 'rc1')
31
+ __version__ = version = '0.6.5'
32
+ __version_tuple__ = version_tuple = (0, 6, 5)
33
33
 
34
34
  __commit_id__ = commit_id = None
{compose_runner-0.6.4rc1 → compose_runner-0.6.5}/compose_runner/run.py RENAMED
@@ -198,6 +198,10 @@ class Runner:
198
198
  weights = self.cached_specification.get("weights", [])
199
199
  weight_conditions = {w: c for c, w in zip(conditions, weights)}
200
200
 
201
+ # since we added "order" to annotations
202
+ if isinstance(column_type, dict):
203
+ column_type = column_type.get("type")
204
+
201
205
  if not (conditions or weights) and column_type != "boolean":
202
206
  raise ValueError(
203
207
  f"Column type {column_type} requires a conditions and weights."