Skip to content

Commit

Permalink
Merge pull request #737 from NeurodataWithoutBorders/fix_pyinstaller_…
Browse files Browse the repository at this point in the history
…windows

Fix pyinstaller windows
CodyCBakerPhD authored Apr 11, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 0af0604 + a6ea142 commit 242d92a
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ jobs:

- if: steps.cache.outputs.cache-hit != 'true'
name: Create and activate environment
run: mamba env update -n nwb-guide -f ${{ matrix.label }}
run: mamba env update --name nwb-guide --file ${{ matrix.label }}

- name: Use Node.js 20
uses: actions/setup-node@v4
4 changes: 4 additions & 0 deletions guide_testing_suite.yml
Original file line number Diff line number Diff line change
@@ -44,3 +44,7 @@ pipelines:
folder_path: ephy_testing_data/cellexplorer/dataset_4/Peter_MS22_180629_110319_concat_stubbed
CellExplorerSortingInterface:
file_path: ephy_testing_data/cellexplorer/dataset_4/Peter_MS22_180629_110319_concat_stubbed/Peter_MS22_180629_110319_concat_stubbed.spikes.cellinfo.mat

IntanSingleFileRecording:
IntanRecordingInterface:
file_path: ephy_testing_data/intan/intan_rhd_test_1.rhd
4 changes: 4 additions & 0 deletions nwb-guide.spec
Original file line number Diff line number Diff line change
@@ -42,6 +42,10 @@ tmp_ret = collect_all('sklearn')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
tmp_ret = collect_all('ci_info')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
tmp_ret = collect_all('tifffile')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
tmp_ret = collect_all('dlc2nwb')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]


block_cipher = None
8 changes: 2 additions & 6 deletions pyflask/manageNeuroconv/manage_neuroconv.py
Original file line number Diff line number Diff line change
@@ -1384,7 +1384,6 @@ def update_recording_properties_from_table_as_json(

recording_extractor = recording_interface.recording_extractor
channel_ids = recording_extractor.get_channel_ids()
stream_prefix = channel_ids[0].split("#")[0] # TODO: see if this generalized across formats

# TODO: uncomment when neuroconv supports contact vectors (probe interface)
# property_names = recording_extractor.get_property_keys()
@@ -1394,7 +1393,7 @@ def update_recording_properties_from_table_as_json(

for entry_index, entry in enumerate(electrode_table_json):
electrode_properties = dict(entry) # copy
channel_name = electrode_properties.pop("channel_name", None)
# channel_name = electrode_properties.pop("channel_name", None)
for property_name, property_value in electrode_properties.items():
if property_name not in electrode_column_data_types: # Skip data with missing column information
continue
@@ -1403,13 +1402,10 @@ def update_recording_properties_from_table_as_json(
# property_index = contact_vector_property_names.index(property_name)
# modified_contact_vector[entry_index][property_index] = property_value
else:
ids = (
[stream_prefix + "#" + channel_name] if channel_name else []
) # Correct for minimal metadata (e.g. CellExplorer)
recording_extractor.set_property(
key=property_name,
values=np.array([property_value], dtype=electrode_column_data_types[property_name]),
ids=ids,
ids=[channel_ids[entry_index]], # Assume rows match indices of channel list
)

# TODO: uncomment when neuroconv supports contact vectors (probe interface)

0 comments on commit 242d92a

Please sign in to comment.