From b6d1792b20623bdb941a38c20f1104bac6588a49 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 6 May 2021 18:24:25 +0100 Subject: [PATCH] Pin JPEG version. --- .circleci/unittest/linux/scripts/environment.yml | 3 ++- .circleci/unittest/windows/scripts/environment.yml | 3 ++- packaging/torchvision/meta.yaml | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index dcad1abfa31..5ddc862c869 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -9,7 +9,8 @@ dependencies: - codecov - pip - libpng - - jpeg + # NOTE: Pinned to fix issues with size_t on Windows + - jpeg <=9b - ca-certificates - pip: - future diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index b4f32cb3cad..1f9c38d82c0 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -9,7 +9,8 @@ dependencies: - codecov - pip - libpng - - jpeg + # NOTE: Pinned to fix issues with size_t on Windows + - jpeg <=9b - ca-certificates - pip: - future diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 8516b2f0ed4..d25b00c042f 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -9,7 +9,8 @@ requirements: build: - {{ compiler('c') }} # [win] - libpng - - jpeg + # NOTE: Pinned to fix issues with size_t on Windows + - jpeg <=9b # NOTE: The only ffmpeg version that we build is actually 4.2 - ffmpeg >=4.2 # [not win] @@ -24,7 +25,8 @@ requirements: - python - libpng - ffmpeg >=4.2 # [not win] - - jpeg + # NOTE: Pinned to fix issues with size_t on Windows + - jpeg <=9b - pillow >=5.3.0 {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} @@ -51,7 +53,8 @@ test: - pytest - scipy - av >=8.0.1 - - jpeg + # NOTE: Pinned to fix issues with size_t on Windows + - jpeg <=9b - ca-certificates