Unverified Commit 61943691 authored by Andrey Talman's avatar Andrey Talman Committed by GitHub
Browse files

[cherry-pick] Restrict ffmpeg to 4.2+.X versions to resolve linux conda build failures (#8607)


Co-authored-by: default avatarNikita Shulga <2453524+malfet@users.noreply.github.com>
parent 5bada1fa
...@@ -11,13 +11,13 @@ requirements: ...@@ -11,13 +11,13 @@ requirements:
- {{ compiler('c') }} # [win] - {{ compiler('c') }} # [win]
- libpng - libpng
- libjpeg-turbo - libjpeg-turbo
- ffmpeg >=4.2 # [linux] - ffmpeg >=4.2.2, <5.0.0 # [linux]
host: host:
- python - python
- setuptools - setuptools
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ] - pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT', 'pytorch') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}
run: run:
...@@ -26,11 +26,11 @@ requirements: ...@@ -26,11 +26,11 @@ requirements:
- numpy >=1.23.5 # [py >= 311] - numpy >=1.23.5 # [py >= 311]
- requests - requests
- libpng - libpng
- ffmpeg >=4.2 # [linux] - ffmpeg >=4.2.2, <5.0.0 # [linux]
- libjpeg-turbo - libjpeg-turbo
- pillow >=5.3.0, !=8.3.* - pillow >=5.3.0, !=8.3.*
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ] - pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_CONSTRAINT', 'pytorch') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}
{% if build_variant == 'cpu' %} {% if build_variant == 'cpu' %}
......
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