underscore-prefix Merge. Linter fixes

CBroz1 · Jul 19, 2023 · 7e8b3cf · 7e8b3cf
1 parent 2849513
commit 7e8b3cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/spyglass/lfp_band/lfp_band_merge.py b/src/spyglass/lfp_band/lfp_band_merge.py
@@ -2,13 +2,13 @@
 import pandas as pd
 
 from spyglass.lfp_band.v1.lfp_band import LFPBandV1  # noqa F401
-from spyglass.utils.dj_merge_tables import Merge
+from spyglass.utils.dj_merge_tables import _Merge
 
 schema = dj.schema("lfp_band_merge")
 
 
 @schema
-class LFPBandOutput(Merge):
+class LFPBandOutput(_Merge):
     definition = """
     merge_id: uuid
     ---

diff --git a/src/spyglass/settings.py b/src/spyglass/settings.py
@@ -107,7 +107,7 @@ def base_dir() -> str:
 
 
 def _set_env_with_dict(env_dict: dict):
-    """Sets env vars from dict {str: Any} where Any is convertable to str."""
+    """Sets env vars from dict {str: Any} where Any is convertible to str."""
     env_to_set = {**env_defaults, **env_dict}
     for var, val in env_to_set.items():
         os.environ[var] = str(val)

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -8,7 +8,10 @@
 import datajoint as dj
 
 from .datajoint._config import DATAJOINT_SERVER_PORT
-from .datajoint._datajoint_server import kill_datajoint_server, run_datajoint_server
+from .datajoint._datajoint_server import (
+    kill_datajoint_server,
+    run_datajoint_server,
+)
 
 thisdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(thisdir)