Merge branch 'rc/2.15.1'

AllenInstitute · Jan 25, 2023 · bfc8599 · bfc8599
2 parents 51245c1 + c3ab300
commit bfc8599
Show file tree

Hide file tree

Showing 34 changed files with 9,740 additions and 9,625 deletions.
diff --git a/allensdk/__init__.py b/allensdk/__init__.py
@@ -35,7 +35,7 @@
 #
 import logging
 
-__version__ = '2.15.0'
+__version__ = '2.15.1'
 
 
 try:

diff --git a/...ior/behavior_project_cache/project_apis/data_io/behavior_neuropixels_project_cloud_api.py b/...ior/behavior_project_cache/project_apis/data_io/behavior_neuropixels_project_cloud_api.py
@@ -1,6 +1,6 @@
 import numpy as np
 import pandas as pd
-from allensdk.brain_observatory.behavior.behavior_project_cache.project_apis.data_io.project_cloud_api_base import ( # noqa
+from allensdk.brain_observatory.behavior.behavior_project_cache.project_apis.data_io.project_cloud_api_base import (  # noqa: E501
     ProjectCloudApiBase,
 )
 from allensdk.brain_observatory.behavior.behavior_session import (
@@ -124,7 +124,9 @@ def f():
 
             return f
 
-        if not probes_meta.empty:
+        # Backwards compatibility check for VBN data that doesn't contain
+        # the LFP, probes dataset.
+        if not probes_meta.empty and "file_id" in probes_meta.columns:
             probe_data_path_map = {
                 p.name: make_lazy_load_filepath_function(
                     file_id=str(int(getattr(p, self.cache.file_id_column)))