Merge branch 'master' into people-are-fools-especially-jhaux

pesser · Aug 8, 2019 · 1cf897b · 1cf897b
2 parents f707e34 + ad1fb39
commit 1cf897b
Show file tree

Hide file tree

Showing 10 changed files with 808 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,6 +44,7 @@ jobs:
         - pip install tensorboardX
         - python setup.py install
       script:
+        - python -c "import skimage" # fix failing test due to static tls loading
         - pytest --ignore=examples # use pytest instead of python -m pytest
     - stage: tf_example_tests
       name: "Tensorflow examples test"