From a8116b24c0275d3209d52ee92efd6645e9cabef5 Mon Sep 17 00:00:00 2001 From: bloodearnest Date: Fri, 27 Jan 2023 09:16:50 +0000 Subject: [PATCH] fix: jobrunner 2.65.2 --- .../_vendor/jobrunner/executors/volumes.py | 5 ++- .../opensafely_jobrunner-2.65.1.dist-info.pyi | 1 - .../direct_url.json | 1 - .../opensafely_jobrunner-2.65.2.dist-info.pyi | 1 + .../INSTALLER | 0 .../LICENSE | 0 .../METADATA | 2 +- .../RECORD | 20 ++++----- .../REQUESTED | 0 .../WHEEL | 0 .../direct_url.json | 1 + .../entry_points.txt | 0 .../top_level.txt | 0 vendor.in | 4 +- vendor.txt | 42 +++++++++---------- 15 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info.pyi delete mode 100644 opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/direct_url.json create mode 100644 opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info.pyi rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/INSTALLER (100%) rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/LICENSE (100%) rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/METADATA (99%) rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/RECORD (83%) rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/REQUESTED (100%) rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/WHEEL (100%) create mode 100644 opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/direct_url.json rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/entry_points.txt (100%) rename opensafely/_vendor/{opensafely_jobrunner-2.65.1.dist-info => opensafely_jobrunner-2.65.2.dist-info}/top_level.txt (100%) diff --git a/opensafely/_vendor/jobrunner/executors/volumes.py b/opensafely/_vendor/jobrunner/executors/volumes.py index 7f1ec233..2cefd34a 100644 --- a/opensafely/_vendor/jobrunner/executors/volumes.py +++ b/opensafely/_vendor/jobrunner/executors/volumes.py @@ -49,9 +49,10 @@ def delete_volume(job): docker.delete_volume(docker_volume_name(job)) def write_timestamp(job, path, timeout=None): - with tempfile.NamedTemporaryFile() as f: + with tempfile.NamedTemporaryFile("w") as f: + f.write(str(time.time_ns())) + f.flush() p = Path(f.name) - p.write_text(str(time.time_ns())) docker.copy_to_volume(docker_volume_name(job), p, path, timeout) def read_timestamp(job, path, timeout=None): diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info.pyi b/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info.pyi deleted file mode 100644 index bfbdff2d..00000000 --- a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info.pyi +++ /dev/null @@ -1 +0,0 @@ -from opensafely_jobrunner-2.65.1.dist-info import * \ No newline at end of file diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/direct_url.json b/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/direct_url.json deleted file mode 100644 index c104be79..00000000 --- a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/direct_url.json +++ /dev/null @@ -1 +0,0 @@ -{"url": "https://github.com/opensafely-core/job-runner", "vcs_info": {"commit_id": "e659124590791b40622368adc62787374aa3a11f", "requested_revision": "v2.65.1", "vcs": "git"}} \ No newline at end of file diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info.pyi b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info.pyi new file mode 100644 index 00000000..4db07a18 --- /dev/null +++ b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info.pyi @@ -0,0 +1 @@ +from opensafely_jobrunner-2.65.2.dist-info import * \ No newline at end of file diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/INSTALLER b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/INSTALLER similarity index 100% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/INSTALLER rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/INSTALLER diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/LICENSE b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/LICENSE similarity index 100% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/LICENSE rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/LICENSE diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/METADATA b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/METADATA similarity index 99% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/METADATA rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/METADATA index 8e61e9fb..1e3f05cd 100644 --- a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/METADATA +++ b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: opensafely-jobrunner -Version: 2.65.1 +Version: 2.65.2 Summary: OpenSAFELY job scheduling and executor Author-email: OpenSAFELY License: OpenSAFELY Job Runner diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/RECORD b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/RECORD similarity index 83% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/RECORD rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/RECORD index 5170d429..e7897b3a 100644 --- a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/RECORD +++ b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/RECORD @@ -20,7 +20,7 @@ jobrunner/create_or_update_jobs.py,sha256=atRzjW65lcT-lOyMQqOWK4Og7SS3Ht6Wp9zshI jobrunner/executors/__init__.py,sha256=4-eu9LwIzhALtsq1LDC9NQ_5nbcjsPDdIEGvRvZwIbo,283 jobrunner/executors/local.py,sha256=4VvrP0Abqjt8vrgcwr1GZE4efon41C_ar_V3mJGhk1U,21704 jobrunner/executors/logging.py,sha256=CO7Le6Le1O_Edy7dOi004raY8hcKzWXTr_xaCCKKJvc,1925 -jobrunner/executors/volumes.py,sha256=eqWZhmbw48crDbnm0EkFObAU_fDskq4u9I2hmANby40,5390 +jobrunner/executors/volumes.py,sha256=InzOalmFk0-73i4_IaZK5K0SEe6iwmUu6AyiEpm9Y1s,5410 jobrunner/extractors.py,sha256=9I9JOs8psDLuPaqlsUQ0iG5FeyEpHa3Yu0yOaL-qGVk,899 jobrunner/job_executor.py,sha256=CPlssBhXPDF9FhEJqJs0T3eA0Q0c1p4b4Zk8iD6ILSM,12328 jobrunner/lib/__init__.py,sha256=Lv8p-FcwvRSjDZoDjXaNvnb4QjjKgGB0gqFbg3UeuLs,2775 @@ -44,12 +44,12 @@ jobrunner/run.py,sha256=sQDYM495DTQz5wJ8GwuXMO2GWi5bO13ZW5gBLJzLVVM,24295 jobrunner/service.py,sha256=slmjnTFbOJ0U6SSkVha1ykBHF9paLFydU6tTSF8m478,4179 jobrunner/sync.py,sha256=Gw7NflNOKgqbcdoJkXUOon2Xia8M-hi9y9Bs2_dFdj8,4747 jobrunner/tracing.py,sha256=C7c6jCirfeBUYUhfSdhc6E46Lafqrs-jElZtQVOyiuo,12266 -opensafely_jobrunner-2.65.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -opensafely_jobrunner-2.65.1.dist-info/LICENSE,sha256=F5fS3mizkbW4yOk3XP--G0oDJbZAovAKuSIZShtkCw4,671 -opensafely_jobrunner-2.65.1.dist-info/METADATA,sha256=pzBWJvCwNeMKsXZqQ_Z6Tcjci6_eJKgXGl9HlYogcYQ,8205 -opensafely_jobrunner-2.65.1.dist-info/RECORD,, -opensafely_jobrunner-2.65.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -opensafely_jobrunner-2.65.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92 -opensafely_jobrunner-2.65.1.dist-info/direct_url.json,sha256=rb819C9oEHEoZZ1DwdoXfyv6SA5OV1nsCtWmjMvK_hc,174 -opensafely_jobrunner-2.65.1.dist-info/entry_points.txt,sha256=hat6DNe6ZtwPqk0GIs5BOzd-18yfWfwJrouA1YAmBJY,298 -opensafely_jobrunner-2.65.1.dist-info/top_level.txt,sha256=dHLIHTr12iPEGMfrfPkXrkh8qGsw52DE0cbpHQVbiic,10 +opensafely_jobrunner-2.65.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 +opensafely_jobrunner-2.65.2.dist-info/LICENSE,sha256=F5fS3mizkbW4yOk3XP--G0oDJbZAovAKuSIZShtkCw4,671 +opensafely_jobrunner-2.65.2.dist-info/METADATA,sha256=-hSp6rMvpcVyMEIlo8puJZIR2CtXumfHfXxdqHB0eCE,8205 +opensafely_jobrunner-2.65.2.dist-info/RECORD,, +opensafely_jobrunner-2.65.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 +opensafely_jobrunner-2.65.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92 +opensafely_jobrunner-2.65.2.dist-info/direct_url.json,sha256=iV7g6iq-FAnYOwhuaSNmsjSa9KJOe_uDmmSyuhKdQNY,174 +opensafely_jobrunner-2.65.2.dist-info/entry_points.txt,sha256=hat6DNe6ZtwPqk0GIs5BOzd-18yfWfwJrouA1YAmBJY,298 +opensafely_jobrunner-2.65.2.dist-info/top_level.txt,sha256=dHLIHTr12iPEGMfrfPkXrkh8qGsw52DE0cbpHQVbiic,10 diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/REQUESTED b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/REQUESTED similarity index 100% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/REQUESTED rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/REQUESTED diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/WHEEL b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/WHEEL similarity index 100% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/WHEEL rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/WHEEL diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/direct_url.json b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/direct_url.json new file mode 100644 index 00000000..30fbe365 --- /dev/null +++ b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/direct_url.json @@ -0,0 +1 @@ +{"url": "https://github.com/opensafely-core/job-runner", "vcs_info": {"commit_id": "0cda3012e4cd95028b7ae00aba914d7369df8142", "requested_revision": "v2.65.2", "vcs": "git"}} \ No newline at end of file diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/entry_points.txt b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/entry_points.txt similarity index 100% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/entry_points.txt rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/entry_points.txt diff --git a/opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/top_level.txt b/opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/top_level.txt similarity index 100% rename from opensafely/_vendor/opensafely_jobrunner-2.65.1.dist-info/top_level.txt rename to opensafely/_vendor/opensafely_jobrunner-2.65.2.dist-info/top_level.txt diff --git a/vendor.in b/vendor.in index e75aa214..11901998 100644 --- a/vendor.in +++ b/vendor.in @@ -1,2 +1,2 @@ ---requirement https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt -git+https://github.com/opensafely-core/job-runner@v2.65.1 +--requirement https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt +git+https://github.com/opensafely-core/job-runner@v2.65.2 diff --git a/vendor.txt b/vendor.txt index c8829e13..771f8434 100644 --- a/vendor.txt +++ b/vendor.txt @@ -6,90 +6,90 @@ # backoff==2.1.2 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-exporter-otlp-proto-http certifi==2020.11.8 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # requests chardet==3.0.4 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # requests deprecated==1.2.13 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-api googleapis-common-protos==1.56.4 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-exporter-otlp-proto-http idna==2.10 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # requests -opensafely-jobrunner @ git+https://github.com/opensafely-core/job-runner@v2.65.1 +opensafely-jobrunner @ git+https://github.com/opensafely-core/job-runner@v2.65.2 # via -r vendor.in opensafely-pipeline @ git+https://github.com/opensafely-core/pipeline@v0.2.1 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opensafely-jobrunner opentelemetry-api==1.12.0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-exporter-otlp-proto-http # opentelemetry-sdk opentelemetry-exporter-otlp-proto-http==1.12.0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opensafely-jobrunner opentelemetry-proto==1.12.0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-exporter-otlp-proto-http opentelemetry-sdk==1.12.0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-exporter-otlp-proto-http opentelemetry-semantic-conventions==0.33b0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-sdk protobuf==3.20.2 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # googleapis-common-protos # opentelemetry-proto pydantic==1.9.0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opensafely-pipeline requests==2.25.0 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opensafely-jobrunner # opentelemetry-exporter-otlp-proto-http ruamel-yaml==0.16.12 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opensafely-jobrunner # opensafely-pipeline # ruamel-yaml-clib==0.2.6 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # ruamel-yaml typing-extensions==4.1.1 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # opentelemetry-sdk # pydantic urllib3==1.26.5 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # requests wrapt==1.14.1 # via - # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.1/requirements.prod.txt + # -r https://raw.githubusercontent.com/opensafely-core/job-runner/v2.65.2/requirements.prod.txt # deprecated # The following packages are considered to be unsafe in a requirements file: