Unverified Commit e8dded4c authored by Eli Uriegas's avatar Eli Uriegas Committed by GitHub
Browse files

packaging: Remove pin for jpeg, numpy (#3647)



* 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: default avatarEli Uriegas <eliuriegas@fb.com>

* Update packaging/torchvision/meta.yaml
Co-authored-by: default avatarNicolas Hug <contact@nicolas-hug.com>
Co-authored-by: default avatarFrancisco Massa <fvsmassa@gmail.com>
parent 7da9afee
...@@ -9,14 +9,13 @@ requirements: ...@@ -9,14 +9,13 @@ requirements:
build: build:
- {{ compiler('c') }} # [win] - {{ compiler('c') }} # [win]
- libpng - libpng
- jpeg <=9b - jpeg
# NOTE: The only ffmpeg version that we build is actually 4.2 # NOTE: The only ffmpeg version that we build is actually 4.2
- ffmpeg >=4.2 # [not win] - ffmpeg >=4.2 # [not win]
host: host:
- python - python
- setuptools - setuptools
- defaults::numpy >=1.11
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
{{ environ.get('CONDA_CPUONLY_FEATURE') }} {{ environ.get('CONDA_CPUONLY_FEATURE') }}
...@@ -25,9 +24,8 @@ requirements: ...@@ -25,9 +24,8 @@ requirements:
- python - python
- libpng - libpng
- ffmpeg >=4.2 # [not win] - ffmpeg >=4.2 # [not win]
- jpeg <=9b - jpeg
- pillow >=4.1.1 - pillow >=5.3.0
- defaults::numpy >=1.11
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
...@@ -53,7 +51,7 @@ test: ...@@ -53,7 +51,7 @@ test:
- pytest - pytest
- scipy - scipy
- av >=8.0.1 - av >=8.0.1
- jpeg <=9b - jpeg
- ca-certificates - ca-certificates
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment