diff --git a/pyproject.toml b/pyproject.toml index e9b6c515..c368c398 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ ] requires-python = ">=3.8" dependencies = [ - "opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2023.11.03.163048", + "opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2023.11.06.135620", "ruyaml", "requests", "opentelemetry-exporter-otlp-proto-http", diff --git a/requirements.prod.txt b/requirements.prod.txt index ab71e695..da7e0358 100644 --- a/requirements.prod.txt +++ b/requirements.prod.txt @@ -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@v2023.11.03.163048 +opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2023.11.06.135620 # via opensafely-jobrunner (pyproject.toml) opentelemetry-api==1.12.0 # via diff --git a/tests/fixtures/full_project/project.yaml b/tests/fixtures/full_project/project.yaml index df238e9f..da49ab75 100644 --- a/tests/fixtures/full_project/project.yaml +++ b/tests/fixtures/full_project/project.yaml @@ -23,21 +23,21 @@ actions: needs: [generate_cohort] outputs: highly_sensitive: - male_cohort: cohortextractor-male.* + male_cohort: cohortextractor-male*.csv prepare_data_f_cohortextractor: run: python:latest python analysis/filter_by_sex.py F output/input.csv cohortextractor-female.csv needs: [generate_cohort] outputs: highly_sensitive: - female_cohort: cohortextractor-female.* + female_cohort: cohortextractor-female*.csv prepare_data_with_quote_in_filename_cohortextractor: run: python:latest python analysis/filter_by_sex.py F output/input.csv "cohortextractor-qu'ote.csv" needs: [generate_cohort] outputs: highly_sensitive: - quote_cohort: "cohortextractor-qu'ote.*" + quote_cohort: "cohortextractor-qu'ote.csv" analyse_data_cohortextractor: run: python:latest python analysis/count_lines.py cohortextractor-counts.txt diff --git a/tests/test_create_or_update_jobs.py b/tests/test_create_or_update_jobs.py index 035251b4..0f4261a6 100644 --- a/tests/test_create_or_update_jobs.py +++ b/tests/test_create_or_update_jobs.py @@ -191,7 +191,7 @@ def test_run_all_ignores_failed_actions_that_have_been_removed(tmp_work_dir): run: python:latest -c pass outputs: moderately_sensitive: - name: path + name: path.csv """ create_jobs_with_project_file( make_job_request(action="obsolete_action"), TEST_PROJECT + obsolete_action_def