Merge branch 'fix-conda' into 'master'

[conda] Fixing dependency with six

See merge request !14
5 jobs for master in 48 minutes and 36 seconds (queued for 194 minutes and 11 seconds)
Status Job ID Name Coverage
  Build
passed #129198
docker
build_linux_27

00:17:30

58.0%
passed #129199
docker
build_linux_36

00:27:52

58.0%
passed #129200
macosx
build_macosx_27

00:20:15

58.0%
passed #129201
macosx
build_macosx_36

00:19:23

58.0%
 
  Deploy
passed #129202
deployer
deploy_beta

00:00:19