From 90237f8a5f8c9aef5563b4cbd48ed32555fdbf71 Mon Sep 17 00:00:00 2001 From: sneakers-the-rat <sneakers-the-rat@protonmail.com> Date: Mon, 11 Nov 2024 20:04:37 -0800 Subject: [PATCH 1/3] fix annoying warnings --- miniscope_io/logging.py | 2 +- miniscope_io/stream_daq.py | 2 +- tests/test_stream_daq.py | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/miniscope_io/logging.py b/miniscope_io/logging.py index 3fba3eb3..3d7b3307 100644 --- a/miniscope_io/logging.py +++ b/miniscope_io/logging.py @@ -93,7 +93,7 @@ def _file_handler( def _rich_handler() -> RichHandler: rich_handler = RichHandler(rich_tracebacks=True, markup=True) rich_formatter = logging.Formatter( - "[bold green]\[%(name)s][/bold green] %(message)s", + r"[bold green]\[%(name)s][/bold green] %(message)s", datefmt="[%y-%m-%dT%H:%M:%S]", ) rich_handler.setFormatter(rich_formatter) diff --git a/miniscope_io/stream_daq.py b/miniscope_io/stream_daq.py index 83dd5abc..5caa0fb8 100644 --- a/miniscope_io/stream_daq.py +++ b/miniscope_io/stream_daq.py @@ -800,7 +800,7 @@ def _handle_frame( self.logger.debug("Saving header metadata") try: self._buffered_writer.append( - list(header.model_dump().values()) + [time.time()] + list(header.model_dump(warnings=False).values()) + [time.time()] ) except Exception as e: self.logger.exception(f"Exception saving headers: \n{e}") diff --git a/tests/test_stream_daq.py b/tests/test_stream_daq.py index e6889b9a..62a57301 100644 --- a/tests/test_stream_daq.py +++ b/tests/test_stream_daq.py @@ -123,6 +123,7 @@ def test_csv_output(tmp_path, default_streamdaq, write_metadata, caplog): default_streamdaq.capture(source="fpga", metadata=None, show_video=False) assert not output_csv.exists() + # This is a helper function for test_continuous_and_termination() that is currently skipped """ def capture_wrapper(default_streamdaq, source, show_video, continuous): @@ -132,8 +133,10 @@ def capture_wrapper(default_streamdaq, source, show_video, continuous): pass # expected """ -@pytest.mark.skip("Needs to be implemented." - "Temporary skipped because tests fail in some OS (See GH actions).") + +@pytest.mark.skip( + "Needs to be implemented. Temporary skipped because tests fail in some OS (See GH actions)." +) @pytest.mark.timeout(10) def test_continuous_and_termination(tmp_path, default_streamdaq): """ @@ -162,6 +165,7 @@ def test_continuous_and_termination(tmp_path, default_streamdaq): """ pass + def test_metadata_plotting(tmp_path, default_streamdaq): """ Setting the capture kwarg ``show_metadata == True`` should plot the frame metadata From d9f78d7ab0bb618eab89d3ab2d8440cd8d12a36c Mon Sep 17 00:00:00 2001 From: sneakers-the-rat <sneakers-the-rat@protonmail.com> Date: Mon, 11 Nov 2024 20:08:49 -0800 Subject: [PATCH 2/3] wake up CI --- tests/test_stream_daq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_stream_daq.py b/tests/test_stream_daq.py index 62a57301..a1ca9fd5 100644 --- a/tests/test_stream_daq.py +++ b/tests/test_stream_daq.py @@ -114,7 +114,7 @@ def test_csv_output(tmp_path, default_streamdaq, write_metadata, caplog): # actually not sure what we should be looking for here, for now we just check for shape # this should be the same as long as the test data stays the same, # but it's a pretty weak test. - assert df.shape == (910, 12) + assert df.shape == (910, 12) # # ensure there were no errors during capture for record in caplog.records: From a28f452ddf98d133f61c864f0e44fe4901c8487b Mon Sep 17 00:00:00 2001 From: sneakers-the-rat <sneakers-the-rat@protonmail.com> Date: Mon, 11 Nov 2024 20:09:03 -0800 Subject: [PATCH 3/3] Revert "wake up CI" This reverts commit d9f78d7ab0bb618eab89d3ab2d8440cd8d12a36c. --- tests/test_stream_daq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_stream_daq.py b/tests/test_stream_daq.py index a1ca9fd5..62a57301 100644 --- a/tests/test_stream_daq.py +++ b/tests/test_stream_daq.py @@ -114,7 +114,7 @@ def test_csv_output(tmp_path, default_streamdaq, write_metadata, caplog): # actually not sure what we should be looking for here, for now we just check for shape # this should be the same as long as the test data stays the same, # but it's a pretty weak test. - assert df.shape == (910, 12) # + assert df.shape == (910, 12) # ensure there were no errors during capture for record in caplog.records: