From de012b5487b1ada553ca5ed18cf88a0c20ee201b Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 7 Apr 2021 10:18:35 -0700 Subject: [PATCH 1/2] packaging: Remove pin for jpeg, numpy These may no longer be necessary due to the default anaconda channel having the necessary packages now. Signed-off-by: Eli Uriegas --- packaging/torchvision/meta.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 8279c276433..d4b0c4eb914 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -9,14 +9,13 @@ requirements: build: - {{ compiler('c') }} # [win] - libpng - - jpeg <=9b + - jpeg # NOTE: The only ffmpeg version that we build is actually 4.2 - ffmpeg >=4.2 # [not win] host: - python - setuptools - - defaults::numpy >=1.11 {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CPUONLY_FEATURE') }} @@ -25,9 +24,8 @@ requirements: - python - libpng - ffmpeg >=4.2 # [not win] - - jpeg <=9b + - jpeg - pillow >=4.1.1 - - defaults::numpy >=1.11 {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} @@ -53,7 +51,7 @@ test: - pytest - scipy - av >=8.0.1 - - jpeg <=9b + - jpeg - ca-certificates From e026ddf87251fd71da8504bbe37071b2b555d6a5 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Thu, 8 Apr 2021 09:41:31 +0100 Subject: [PATCH 2/2] Update packaging/torchvision/meta.yaml --- packaging/torchvision/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index d4b0c4eb914..8516b2f0ed4 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -25,7 +25,7 @@ requirements: - libpng - ffmpeg >=4.2 # [not win] - jpeg - - pillow >=4.1.1 + - pillow >=5.3.0 {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}