Merge pull request #18 from jacquelinegarrahan/tf_fix

BUG: Appropriately account for the tensorflow version
slaclab · Oct 16, 2020 · de27a07 · de27a07
2 parents 95ff861 + 631af12
commit de27a07
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -29,7 +29,6 @@ test:
   requires:
     - pytest
   commands:
-    - pip install tensorflow
     - py.test --pyargs lume_model
 
 about:

diff --git a/lume_model/tests/keras/test_model.py b/lume_model/tests/keras/test_model.py
@@ -1,13 +1,11 @@
 import pytest
 import sys
-import tensorflow
 from lume_model import utils
 from lume_model.variables import InputVariable, OutputVariable
 
 
-@pytest.mark.skipif(tensorflow.version != "2.3.1", reason="Incompatible tf version.")
 def test_model_from_yaml(config_file):
-    pytest.importorskip("tensorflow")
+    pytest.importorskip("tensorflow", minversion="2.3.1")
     model = utils.model_from_yaml(config_file)
     model.random_evaluate()