From 5351ef2304f60ebe4ced1eb18ed9aaae831968e4 Mon Sep 17 00:00:00 2001 From: John Wilkie <124276291+JBWilkie@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:03:19 +0200 Subject: [PATCH 1/2] Pinned dependency versions (#874) --- poetry.lock | 2 +- pyproject.toml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index b49f51d81..2b706f70b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2178,4 +2178,4 @@ test = ["pytest", "responses"] [metadata] lock-version = "2.0" python-versions = ">=3.8.0,<3.12" -content-hash = "61407749d7ce2f08c814267a26d7b7a9db3eaa3627fab45847e2ad9e0584e312" +content-hash = "e9cd836ceb0ae099b5db898c5d0e8695ba2603900f6b0cf117c9add6d87908ab" diff --git a/pyproject.toml b/pyproject.toml index fc3276dce..fd6e942f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,8 +67,8 @@ argcomplete = "^2.0.0" deprecation = "^2.1.0" humanize = "^4.4.0" json-stream = "^2.3.2" -jsonschema = ">=4.0.0" -numpy = "*" +jsonschema = "^4.0.0" +numpy = "^1.24.4" orjson = "^3.8.5" pillow = "^10.1.0" pydantic = "^2.0.0" @@ -131,7 +131,7 @@ version = "^0.15.0" [tool.poetry.dependencies.black] optional = true -version = ">=22.12,<25.0" +version = "^24.4.2" [tool.poetry.dependencies.isort] optional = true @@ -144,7 +144,7 @@ version = "^1.5" [tool.poetry.dependencies.responses] optional = true -version = ">=0.22,<0.26" +version = "^0.25.0" [tool.poetry.dependencies.pytest] optional = true @@ -152,7 +152,7 @@ version = "^7.2.1" [tool.poetry.dependencies.debugpy] optional = true -version = "1.8.1" +version = "^1.8.1" [tool.poetry.dependencies.mpire] version = "^2.7.0" @@ -171,7 +171,7 @@ version = "^12.0" [tool.poetry.dependencies.ruff] optional = true -version = ">=0.0.292,<0.4.8" +version = "^0.4.7" [tool.poetry.dependencies.validate-pyproject] optional = true From f713588f7a463827049c85242e2fb1f69b692868 Mon Sep 17 00:00:00 2001 From: John Wilkie <124276291+JBWilkie@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:26:43 +0100 Subject: [PATCH 2/2] [DAR-2739][External] Add `.mkv`, `.hevc`, `.qtiff` and `.rvg` as supported extensions (#877) * Added .mkv & .hevc supported video formats * Added '.rvg' and '.qtiff' --- darwin/utils/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/darwin/utils/utils.py b/darwin/utils/utils.py index f6159de74..6dbf6548a 100644 --- a/darwin/utils/utils.py +++ b/darwin/utils/utils.py @@ -50,6 +50,7 @@ ".jfif", ".tif", ".tiff", + ".qtiff", ".bmp", ".svs", ".webp", @@ -62,10 +63,13 @@ ".dcm", ".mov", ".mp4", + ".mkv", + ".hevc", ".pdf", ".nii", ".nii.gz", ".ndpi", + ".rvg", ] SUPPORTED_EXTENSIONS = SUPPORTED_IMAGE_EXTENSIONS + SUPPORTED_VIDEO_EXTENSIONS