Skip to content

Commit 49e9788

Browse files
committed
Merge branch 'update-pyproject-toml' of https://github.com/LorenFrankLab/trodes_to_nwb into update-pyproject-toml
2 parents 831052a + 3803819 commit 49e9788

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/trodes_to_nwb/convert_position.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ def convert_h264_to_mp4(file: str, video_directory: str) -> str:
11471147

11481148
try:
11491149
# Construct the ffmpeg command
1150-
subprocess.run(["ffmpeg", "-i", file, new_file_name], check=False)
1150+
subprocess.run(["ffmpeg", "-i", file, new_file_name], check=True)
11511151
logger.info(
11521152
f"Video conversion completed. {file} has been converted to {new_file_name}"
11531153
)
@@ -1191,7 +1191,7 @@ def copy_video_to_directory(file: str, video_directory: str) -> str:
11911191

11921192
try:
11931193
# Construct the ffmpeg command
1194-
subprocess.run(["cp", file, new_file_name], check=False)
1194+
subprocess.run(["cp", file, new_file_name], check=True)
11951195
logger.info(f"Video copy completed. {file} has been copied to {new_file_name}")
11961196
return new_file_name
11971197
except subprocess.CalledProcessError as e:

src/trodes_to_nwb/tests/test_convert_analog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test_selection_of_multiplexed_data():
9393
assert len(rec_dci.neo_io[0].multiplexed_channel_xml.keys()) == 10
9494
slice_ind = [(0, 4), (0, 30), (1, 15), (5, 15), (20, 25)]
9595
expected_channels = [4, 22, 14, 10, 2]
96-
for ind, expected in zip(slice_ind, expected_channels, strict=False):
96+
for ind, expected in zip(slice_ind, expected_channels, strict=True):
9797
data = rec_dci._get_data(
9898
(
9999
slice(0, 100, None),

0 commit comments

Comments
 (0)