From 9cd0fdef85b9dee4ebcdb7cb8863313062483504 Mon Sep 17 00:00:00 2001 From: bloodearnest Date: Thu, 21 Mar 2024 10:47:40 +0000 Subject: [PATCH] Bump to pipeline 2024.3.19.153938 --- jobrunner/config.py | 20 +++----------------- pyproject.toml | 2 +- requirements.prod.txt | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/jobrunner/config.py b/jobrunner/config.py index 2717a552..1eb698f7 100644 --- a/jobrunner/config.py +++ b/jobrunner/config.py @@ -6,6 +6,8 @@ from multiprocessing import cpu_count from pathlib import Path +import pipeline + class ConfigException(Exception): pass @@ -144,23 +146,7 @@ def database_urls_from_env(env): ) # 16mb -# TODO: we might want to take this list from pipeline if we implement it there. -LEVEL4_FILE_TYPES = [ - # tables - ".csv", - # images - ".jpg", - ".jpeg", - ".png", - ".svg", - ".svgz", - # reports - ".html", - ".txt", - ".log", - ".json", - ".md", -] +LEVEL4_FILE_TYPES = pipeline.constants.LEVEL4_FILE_TYPES STATA_LICENSE = os.environ.get("STATA_LICENSE") STATA_LICENSE_REPO = os.environ.get( diff --git a/pyproject.toml b/pyproject.toml index d5836cf9..e6e5be34 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@v2024.01.29.114645", + "opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2024.03.19.153938", "ruyaml", "requests", "opentelemetry-exporter-otlp-proto-http", diff --git a/requirements.prod.txt b/requirements.prod.txt index f129593f..8f1c9893 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@v2024.01.29.114645 +opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v2024.03.19.153938 # via opensafely-jobrunner (pyproject.toml) opentelemetry-api==1.12.0 # via