Merge branch 'master' into test_cli_interface

pesser · Aug 8, 2019 · 5a655a7 · 5a655a7
2 parents aa569d3 + a31fa87
commit 5a655a7
Show file tree

Hide file tree

Showing 11 changed files with 813 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"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,6 +2,11 @@
 
 The following is a set of guidelines for contributing to edflow. These are mostly guidelines, not rules. Use your best judgment on when to apply them and always be nice to each other :heart:.
 
+> ### code-block
+> In your docstring write **``.. code-block:: <language>``**, when showing examples.
+>
+> This comment is right here, because everyone seems to do it wrong.
+  
 #### Table Of Contents
 
 [Code of Conduct](#code-of-conduct)