fixed some pep8 and flake8 errors

eggnag · Jun 16, 2015 · 3befbe5 · 3befbe5
1 parent 8d6ff29
commit 3befbe5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/sacred/experiment.py b/sacred/experiment.py
@@ -19,6 +19,7 @@
 
 __sacred__ = True  # marks files that should be filtered from stack traces
 
+
 @wrapt.decorator
 def optional_kwargs_decorator(wrapped, instance, args, kwargs):
     def _decorated(func):

diff --git a/sacred/ingredients/__init__.py b/sacred/ingredients/__init__.py
@@ -3,5 +3,9 @@
 from __future__ import division, print_function, unicode_literals
 import sacred.optional as opt
 
+__all__ = ['whet']
+
 if opt.has_whetlab:
     from sacred.ingredients.whetlab import whet
+else:
+    whet = opt.MissingDependencyMock('whetlab')
diff --git a/setup.cfg b/setup.cfg
@@ -2,9 +2,10 @@
 universal=1
 [pytest]
 pep8ignore =
-    tests/test_config_scope.py ALL  # Lots of errors that need to be there for testing
+    tests/test_config/test_config_scope.py ALL  # Lots of errors that need to be there for testing
     build/* ALL
     dist/* ALL
     sacred.egg-info/* ALL
 [flake8]
 ignore = D100,D101,D102,D103
+exclude = sacred/ingredients/*
diff --git a/tests/test_config/__init__.py b/tests/test_config/__init__.py
@@ -1,3 +1,3 @@
 #!/usr/bin/env python
 # coding=utf-8
-from __future__ import division, print_function, unicode_literals
+from __future__ import division, print_function, unicode_literals
diff --git a/tests/test_config/test_config_scope.py b/tests/test_config/test_config_scope.py
@@ -32,7 +32,6 @@ def ignored2():
 
         ignored3 = int
 
-
     cfg()
     return cfg
 
@@ -45,7 +44,7 @@ def test_result_of_config_scope_is_dict(conf_scope):
 def test_result_of_config_scope_contains_keys(conf_scope):
     cfg = conf_scope()
     assert set(cfg.keys()) == {'a', 'b', 'c', 'd', 'e', 'f',
-                                      'composit1', 'composit2', 'deriv'}
+                               'composit1', 'composit2', 'deriv'}
 
     assert cfg['a'] == 1
     assert cfg['b'] == 2.0
@@ -81,8 +80,8 @@ def test_adding_values(conf_scope):
 def test_typechange(conf_scope):
     cfg = conf_scope({'a': 'bar', 'b': 'foo', 'c': 1})
     assert cfg.typechanged == {'a': (int, type('bar')),
-                                      'b': (float, type('foo')),
-                                      'c': (bool, int)}
+                               'b': (float, type('foo')),
+                               'c': (bool, int)}
 
 
 def test_nested_typechange(conf_scope):

diff --git a/tests/test_optional.py b/tests/test_optional.py
@@ -29,4 +29,4 @@ def test_optional_import():
 def test_optional_import_nonexisting():
     has_nonex, nonex = optional_import('clearlynonexistingpackage')
     assert not has_nonex
-    assert nonex is None
+    assert nonex is None