Commit 9c4f68a3 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

avoid conflicts

parent 1a087a6f
Pipeline #45802 canceled with stage
in 8 minutes and 15 seconds
......@@ -58,7 +58,7 @@ requirements:
- pkg-config 0.29.2
- psycopg2 2.8.5
- pybind11 2.5.0
- pyopengl 3.1.1
- pyopengl 3.1.1a1
- pyqtgraph 0.11.0
- pytest 6.1.1
- pytest-cov 2.10.1
......
......@@ -75,11 +75,10 @@ requirements:
- nomkl # [blas_impl == 'openblas']
- hdf5 {{ hdf5 }} # [unix]
- eigen 3.3.*
- jasper
- jasper {{ jasper }}
- zlib {{ zlib }}
- jpeg {{ jpeg }}
- libtiff {{ libtiff }}
- libwebp {{ libwebp }}
- harfbuzz {{ harfbuzz }} # [unix]
- libpng {{ libpng }}
- ffmpeg {{ ffmpeg }} # [not win]
......@@ -87,15 +86,11 @@ requirements:
- freetype {{ freetype }}
- glib {{ glib }} # [unix]
run:
- {{ pin_compatible('harfbuzz') }} # [unix]
# Don't depend on python in the run section
# py-opencv will depend on python
- qt 5.9.* # [not osx and not aarch64 and not ppc64le]
# https://github.com/conda-forge/opencv-feedstock/issues/174
# Seems like the OSX ABI has changed between 2.9 and 2.10???
# That or a dependency wasn't merged in
# Since we don't know the cause, we are choosing this pinning on all platforms.
- {{ pin_compatible('freetype', min_pin='x.x') }}
- {{ pin_compatible('harfbuzz') }} # [unix]
test:
requires:
......
......@@ -74,19 +74,19 @@ ffmpeg:
freetype:
- 2.10
glib:
- 2
- 2.63.1
harfbuzz:
- 2.4
- 1.8.8
hdf5:
- 1.10.6
jasper:
- 2.0.14
jpeg:
- 9
libpng:
- 1.6
libtiff:
- 4.1
libwebp:
- 1.0.0
mkl:
- 2019
numpy:
......
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