Merge branch 'fix-conda' into 'master'

[conda] Fix conda

See merge request !11
5 jobs for master in 29 minutes and 47 seconds (queued for 23 minutes and 37 seconds)
Status Job ID Name Coverage
  Build
passed #122009
docker
build_linux_27

00:13:59

64.0%
passed #122010
docker
build_linux_36

00:10:48

64.0%
passed #122011
macosx
build_macosx_27

00:14:34

64.0%
passed #122012
macosx
build_macosx_36

00:12:34

64.0%
 
  Deploy
passed #122013
deployer
deploy_beta

00:00:33