Merge branch '19-bpm-jpeg_quality-control' into 'master'

Resolve "bpm jpeg_quality control"

Closes esrf-bliss#19

See merge request limagroup/Lima-tango-python!43

Author: claustre

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 build-noarch:
   stage: build
   script:
-    - conda build ./conda --prefix-length=80 --output-folder=dist/ -c tango-controls --channel=http://bcu-ci.esrf.fr/stable
+    - conda build ./conda --prefix-length=80 --output-folder=dist/ -c tango-controls --channel=http://bcu-ci.esrf.fr/stable -c conda-forge
   artifacts:
     paths:
       - dist/

conda/meta.yaml

@@ -18,6 +18,7 @@ requirements:
   run:
     - pytango
     - pillow # Required by the Bpm plugin
+    - libjpeg-turbo # Required by the Bpm plugin
 
 about:
   home: https://github.com/esrf-bliss/Lima