Merge 419c4d3 into 985567b

.travis.yml

@@ -12,7 +12,11 @@ matrix:
   - python: "3.7"
     env: TOX_ENV=py37
   - python: "3.6"
-    env: TOX_ENV=tensorflow-1
+    env: TOX_ENV=tensorflow-112
+  - python: "3.6"
+    env: TOX_ENV=tensorflow-113
+  - python: "3.6"
+    env: TOX_ENV=tensorflow-114
   - python: "3.6"
     env: TOX_ENV=tensorflow-2
   - python: "3.7"

sacred/utils.py

@@ -618,7 +618,12 @@ def apply_backspaces_and_linefeeds(text):
 
 def module_exists(modname):
     """Checks if a module exists without actually importing it."""
-    return pkgutil.find_loader(modname) is not None
+    try:
+        return pkgutil.find_loader(modname) is not None
+    except ImportError:
+        # TODO: Temporary fix for tf 1.14.0. 
+        # Should be removed once fixed in tf.
+        return True
 
 
 def modules_exist(*modnames):

tests/test_optional.py

@@ -2,16 +2,28 @@
 # coding=utf-8
 
 import pytest
-from sacred.optional import optional_import
+from sacred.optional import optional_import, get_tensorflow, modules_exist
 
 
 def test_optional_import():
-    has_pytest, pyt = optional_import('pytest')
+    has_pytest, pyt = optional_import("pytest")
     assert has_pytest
     assert pyt == pytest
 
 
 def test_optional_import_nonexisting():
-    has_nonex, nonex = optional_import('clearlynonexistingpackage')
+    has_nonex, nonex = optional_import("clearlynonexistingpackage")
     assert not has_nonex
     assert nonex is None
+
+
+def test_get_tensorflow():
+    """Test that get_tensorflow() runs without error."""
+    pytest.importorskip("tensorflow")
+    get_tensorflow()
+
+
+def test_module_exists_for_tensorflow():
+    """Check that module_exist returns true if tf is there."""
+    pytest.importorskip("tensorflow")
+    assert modules_exist("tensorflow")

tests/test_stflow/test_method_interception.py

@@ -8,7 +8,7 @@
 
 @pytest.fixture
 def ex():
-    return Experiment('tensorflow_tests')
+    return Experiment("tensorflow_tests")
 
 
 @pytest.fixture()
@@ -18,6 +18,7 @@ def tf():
     so `tensorflow` is not required during the tests.
     """
     from sacred.optional import has_tensorflow
+
     if has_tensorflow:
         return opt.get_tensorflow()
     else:
@@ -28,7 +29,10 @@ class FileWriter:
                     def __init__(self, logdir, graph):
                         self.logdir = logdir
                         self.graph = graph
-                        print("Mocked FileWriter got logdir=%s, graph=%s" % (logdir, graph))
+                        print(
+                            "Mocked FileWriter got logdir=%s, graph=%s"
+                            % (logdir, graph)
+                        )
 
             class Session:
                 def __init__(self):
@@ -42,6 +46,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
         # Set stflow to use the mock as the test
         import sacred.stflow.method_interception
+
         sacred.stflow.method_interception.tf = tensorflow
         return tensorflow
 
@@ -90,7 +95,10 @@ def run_experiment(_run):
                 assert swr is not None
                 assert _run.info["tensorflow"]["logdirs"] == [TEST_LOG_DIR]
                 tf.summary.FileWriter(TEST_LOG_DIR2, s.graph)
-                assert _run.info["tensorflow"]["logdirs"] == [TEST_LOG_DIR, TEST_LOG_DIR2]
+                assert _run.info["tensorflow"]["logdirs"] == [
+                    TEST_LOG_DIR,
+                    TEST_LOG_DIR2,
+                ]
 
             # This should not be captured:
             tf.summary.FileWriter("/tmp/whatever", s.graph)
@@ -133,7 +141,7 @@ def test_log_summary_writer_class(ex, tf):
     TEST_LOG_DIR = "/dev/null"
     TEST_LOG_DIR2 = "/tmp/sacred_test"
 
-    class FooClass():
+    class FooClass:
         def __init__(self):
             pass
 

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py35, py36, py37, setup, flake8, tensorflow-1, tensorflow-2
+envlist = py35, py36, py37, setup, flake8, tensorflow-112, tensorflow-113, tensorflow-114, tensorflow-2
 # py32 does not work because of the 'wrapt' dependency
 # py33 is not supported by newer versions of numpy
 # py34 is not supported by newer versions of pandas
@@ -16,20 +16,38 @@ commands =
     pytest \
         {posargs} # substitute with tox' positional arguments
 
-[testenv:tensorflow-1]
+[testenv:tensorflow-112]
 basepython = python
 deps =
     -rdev-requirements.txt
-    tensorflow==1.12.2
+    tensorflow==1.12.3
 commands =
-    pytest tests/test_stflow \
+    pytest tests/test_stflow tests/test_optional.py \
+        {posargs}
+
+[testenv:tensorflow-113]
+basepython = python
+deps =
+    -rdev-requirements.txt
+    tensorflow==1.13.2
+commands =
+    pytest tests/test_stflow tests/test_optional.py \
+        {posargs}
+
+[testenv:tensorflow-114]
+basepython = python
+deps =
+    -rdev-requirements.txt
+    tensorflow==1.14.0
+commands =
+    pytest tests/test_stflow tests/test_optional.py \
         {posargs}
 
 [testenv:tensorflow-2]
 basepython = python
 deps =
     -rdev-requirements.txt
-    tensorflow==2.0.0-alpha0
+    tensorflow==2.0.0-beta1
 commands =
     pytest tests/test_stflow \
         {posargs}