Refactored code

Author: seanlaw

stumpy/cache.py

@@ -5,7 +5,6 @@
 import ast
 import importlib
 import inspect
-import os
 import pathlib
 import site
 import warnings
@@ -118,8 +117,6 @@ def _clear(cache_dir=None):
     """
     if cache_dir is not None:  # pragma: no cover
         numba_cache_dir = str(cache_dir)
-    elif "PYTEST_CURRENT_TEST" in os.environ:
-        numba_cache_dir = "stumpy/__pycache__"
     else:  # pragma: no cover
         site_pkg_dir = site.getsitepackages()[0]
         numba_cache_dir = site_pkg_dir + "/stumpy/__pycache__"
@@ -163,8 +160,6 @@ def _get_cache(cache_dir=None):
     warnings.warn(CACHE_WARNING)
     if cache_dir is not None:  # pragma: no cover
         numba_cache_dir = str(cache_dir)
-    elif "PYTEST_CURRENT_TEST" in os.environ:
-        numba_cache_dir = "stumpy/__pycache__"
     else:  # pragma: no cover
         site_pkg_dir = site.getsitepackages()[0]
         numba_cache_dir = site_pkg_dir + "/stumpy/__pycache__"
@@ -250,7 +245,7 @@ def save(cache_dir=None):
     else:  # pragma: no cover
         warnings.warn(CACHE_WARNING)
 
-    if numba.config.CACHE_DIR != "":
+    if numba.config.CACHE_DIR != "":  # pragma: no cover
         msg = "Found user specified `NUMBA_CACHE_DIR`/`numba.config.CACHE_DIR`. "
         msg += "The `stumpy` cache files may not be saved/cleared correctly!"
         warnings.warn(msg)

stumpy/fastmath.py

@@ -64,6 +64,7 @@ def _set(module_name, func_name, flag):
         if numba.config.DISABLE_JIT and (
             str(e) == "'function' object has no attribute 'targetoptions'"
         ):
+            warnings.warn("Fastmath flags could not be set as Numba JIT is disabled")
             pass
         else:  # pragma: no cover
             raise

tests/test_cache.py

@@ -1,4 +1,3 @@
-import numba
 import numpy as np
 
 from stumpy import cache, stump
@@ -13,22 +12,19 @@ def test_cache_save_after_clear():
     T = np.random.rand(10)
     m = 3
 
-    cache.save()
-    stump(T, m)
-    ref_cache = cache._get_cache()
+    cache_dir = "stumpy/__pycache__"
 
-    if numba.config.DISABLE_JIT:
-        assert len(ref_cache) == 0
-    else:  # pragma: no cover
-        assert len(ref_cache) > 0
+    cache.save(cache_dir)
+    stump(T, m)
+    ref_cache = cache._get_cache(cache_dir)
 
-    cache.clear()
-    assert len(cache._get_cache()) == 0
+    cache.clear(cache_dir)
+    assert len(cache._get_cache(cache_dir)) == 0
 
-    cache.save()
+    cache.save(cache_dir)
     stump(T, m)
-    comp_cache = cache._get_cache()
+    comp_cache = cache._get_cache(cache_dir)
 
     assert sorted(ref_cache) == sorted(comp_cache)
 
-    cache.clear()
+    cache.clear(cache_dir)