Skip to content

Commit

Permalink
Merge pull request #753 from opensafely-core/bump-2024-09-27-131013
Browse files Browse the repository at this point in the history
Bump to pipeline 2024.09.27.131013
  • Loading branch information
alarthast authored Oct 8, 2024
2 parents 0c0321c + 71b5278 commit 353bf7e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion jobrunner/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def get_action_specification(config, action_id, using_dummy_data_backend=False):
return ActionSpecification(
run=run_command,
needs=action_spec.needs,
outputs=action_spec.outputs.dict(exclude_unset=True),
outputs=action_spec.outputs.dict(),
action=action_spec,
)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ classifiers = [
]
requires-python = ">=3.8"
dependencies = [
"opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2024.03.19.153938",
"opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2024.09.27.131013",
"ruyaml",
"requests",
"opentelemetry-exporter-otlp-proto-http",
Expand Down
2 changes: 1 addition & 1 deletion requirements.prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ googleapis-common-protos==1.56.4
# via opentelemetry-exporter-otlp-proto-http
idna==2.10
# via requests
opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2024.03.19.153938
opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2024.09.27.131013
# via opensafely-jobrunner (pyproject.toml)
opentelemetry-api==1.12.0
# via
Expand Down
16 changes: 8 additions & 8 deletions tests/test_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
reason="ActionSpecification is only used to build commands for Docker",
)
def test_get_action_specification_databuilder_has_output_flag():
config = Pipeline(
config = Pipeline.build(
**{
"version": 3,
"expectations": {"population_size": 1000},
Expand Down Expand Up @@ -44,7 +44,7 @@ def test_get_action_specification_databuilder_has_output_flag():
reason="ActionSpecification is only used to build commands for Docker",
)
def test_get_action_specification_for_cohortextractor_generate_cohort_action():
config = Pipeline(
config = Pipeline.build(
**{
"version": 3,
"expectations": {"population_size": 1000},
Expand Down Expand Up @@ -72,7 +72,7 @@ def test_get_action_specification_for_cohortextractor_generate_cohort_action():
reason="ActionSpecification is only used to build commands for Docker",
)
def test_get_action_specification_with_config():
config = Pipeline(
config = Pipeline.build(
**{
"version": 3,
"expectations": {"population_size": 1_000},
Expand Down Expand Up @@ -115,14 +115,14 @@ def test_get_action_specification_with_dummy_data_file_flag(tmp_path):
with dummy_data_file.open("w") as f:
f.write("test")

config = Pipeline(
config = Pipeline.build(
**{
"version": 1,
"actions": {
"generate_cohort": {
"run": "cohortextractor:latest generate_cohort",
"outputs": {"moderately_sensitive": {"cohort": "output/input.csv"}},
"dummy_data_file": dummy_data_file,
"dummy_data_file": str(dummy_data_file),
}
},
}
Expand Down Expand Up @@ -154,14 +154,14 @@ def test_get_action_specification_without_dummy_data_file_flag(tmp_path):
with dummy_data_file.open("w") as f:
f.write("test")

config = Pipeline(
config = Pipeline.build(
**{
"version": 1,
"actions": {
"generate_cohort": {
"run": "cohortextractor:latest generate_cohort",
"outputs": {"moderately_sensitive": {"cohort": "output/input.csv"}},
"dummy_data_file": dummy_data_file,
"dummy_data_file": str(dummy_data_file),
}
},
}
Expand All @@ -178,7 +178,7 @@ def test_get_action_specification_without_dummy_data_file_flag(tmp_path):
reason="ActionSpecification is only used to build commands for Docker",
)
def test_get_action_specification_with_unknown_action():
config = Pipeline(
config = Pipeline.build(
**{
"version": 1,
"actions": {
Expand Down

0 comments on commit 353bf7e

Please sign in to comment.