Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Kabilar Gunalan <[email protected]>
Co-authored-by: Dimitri Yatsenko <[email protected]>
  • Loading branch information
3 people authored Jul 12, 2022
commit d7165acaa1abf7a8ea73b8591cae1b54323c7328
2 changes: 0 additions & 2 deletions notebooks/py_scripts/03-process.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
session_key = dict(subject='subject1',
session_datetime='2021-01-01 00:00:01')

miniscope.RecordingInfo.children(as_objects=False)

session.Session.insert1(session_key)

session.Session()
Expand Down
27 changes: 8 additions & 19 deletions tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@ def dj_config():
def test_data(dj_config):
mini_root_dirs = dj.config['custom']['miniscope_root_data_dir']

test_data_exists = np.all([find_full_path(mini_root_dirs, p).exists()
for p in sessions_dirs])
test_data_exists = all(find_full_path(mini_root_dirs, p).exists()
for p in sessions_dirs)

if not test_data_exists:
import djarchive_client

if not isinstance(mini_root_dirs, list):
from collections import abc
if not isinstance(mini_root_dirs, abc.Sequence):
mini_root_dirs = list(mini_root_dirs)
djarchive_client.client().download('workflow-miniscope-test-set',
'v1',
Expand Down Expand Up @@ -151,11 +152,8 @@ def sessions_csv():

yield session_content, session_csv_path
if _tear_down:
if verbose:
with contextlib.nullconext if verbose else QuietStdOut():
session_csv_path.unlink()
else:
with QuietStdOut():
session_csv_path.unlink()


@pytest.fixture
Expand Down Expand Up @@ -222,11 +220,8 @@ def caiman_paramset(pipeline):
yield params_caiman

if _tear_down:
if verbose:
with contextlib.nullcontext if verbose else QuietStdOut():
(miniscope.ProcessingParamSet & 'paramset_id = 0').delete()
else:
with QuietStdOut():
(miniscope.ProcessingParamSet & 'paramset_id = 0').delete()


@pytest.fixture
Expand All @@ -238,10 +233,7 @@ def recording_info(pipeline, ingest_sessions):
yield

if _tear_down:
if verbose:
miniscope.RecordingInfo.delete()
else:
with QuietStdOut():
with contextlib.nullcontext if verbose else QuietStdOut():
miniscope.RecordingInfo.delete()


Expand All @@ -267,11 +259,8 @@ def processing_tasks(pipeline, caiman_paramset, recording_info):
yield

if _tear_down:
if verbose:
with contextlib.nullcontext if verbose else QuietStdOut():
miniscope.ProcessingTask.delete()
else:
with QuietStdOut():
miniscope.ProcessingTask.delete()


@pytest.fixture
Expand Down
2 changes: 1 addition & 1 deletion workflow_miniscope/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Package metadata"""
__version__ = '0.1.1'
__version__ = '0.2.0'