Enable testing arm64 Mac architecture in the CI.

.github/workflows/doctests.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags

.github/workflows/live-service-testing.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags

.github/workflows/testing.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags

CHANGELOG.md

@@ -15,6 +15,7 @@
 
 
 ## Improvements
+* Testing on mac sillicon [PR #1061](https://github.com/catalystneuro/neuroconv/pull/1061)
 * Add writing to zarr test for to the test on data [PR #1056](https://github.com/catalystneuro/neuroconv/pull/1056)
 * Modified the CI to avoid running doctests twice [PR #1077](https://github.com/catalystneuro/neuroconv/pull/#1077)
 

docs/conversion_examples_gallery/conftest.py

@@ -1,6 +1,8 @@
+import platform
 from pathlib import Path
 
 import pytest
+from packaging import version
 
 from tests.test_on_data.setup_paths import (
     BEHAVIOR_DATA_PATH,
@@ -19,3 +21,17 @@ def add_data_space(doctest_namespace, tmp_path):
 
     doctest_namespace["path_to_save_nwbfile"] = Path(tmp_path) / "doctest_file.nwb"
     doctest_namespace["output_folder"] = Path(tmp_path)
+
+
+
+python_version = platform.python_version()
+os = platform.system()
+# Hook to conditionally skip doctests in deeplabcut.rst for Python 3.9 on macOS (Darwin)
+def pytest_runtest_setup(item):
+    if isinstance(item, pytest.DoctestItem):
+        # Check if we are running the doctest from deeplabcut.rst
+        test_file = Path(item.fspath)
+        if test_file.name == "deeplabcut.rst":
+            # Check if Python version is 3.9 and platform is Darwin (macOS)
+            if version.parse(python_version) < version.parse("3.10") and os == "Darwin":
+                pytest.skip("Skipping doctests for deeplabcut.rst on Python 3.9 and macOS")

src/neuroconv/datainterfaces/behavior/deeplabcut/_dlc_utils.py

@@ -379,7 +379,10 @@ def add_subject_to_nwbfile(
     video_name, scorer = h5file.stem.split("DLC")
     scorer = "DLC" + scorer
 
-    df = _ensure_individuals_in_header(pd.read_hdf(h5file), individual_name)
+    # TODO probably could be read directly with h5py
+    # This requires pytables
+    data_frame_from_hdf5 = pd.read_hdf(h5file)
+    df = _ensure_individuals_in_header(data_frame_from_hdf5, individual_name)
 
     # Note the video here is a tuple of the video path and the image shape
     if config_file is not None:

src/neuroconv/datainterfaces/behavior/deeplabcut/requirements.txt

@@ -1,4 +1,3 @@
-tables<3.9.2;sys_platform=="darwin"
-tables;sys_platform=="linux" or sys_platform=="win32"
+tables>=3.10.1; platform_system == 'Darwin' and python_version >= '3.10'
+tables; platform_system != 'Darwin'
 ndx-pose==0.1.1
-neuroconv[video]

tests/test_on_data/behavior/test_behavior_interfaces.py

@@ -320,6 +320,18 @@ class TestFicTracDataInterfaceTiming(TemporalAlignmentMixin):
     save_directory = OUTPUT_PATH
 
 
+from platform import python_version
+
+from packaging import version
+
+python_version = version.parse(python_version())
+from sys import platform
+
+
+@pytest.mark.skipif(
+    platform == "darwin" and python_version < version.parse("3.10"),
+    reason="interface not supported on macOS with Python < 3.10",
+)
 class TestDeepLabCutInterface(DeepLabCutInterfaceMixin):
     data_interface_cls = DeepLabCutInterface
     interface_kwargs = dict(
@@ -365,6 +377,10 @@ def check_read_nwb(self, nwbfile_path: str):
             assert all(expected_pose_estimation_series_are_in_nwb_file)
 
 
+@pytest.mark.skipif(
+    platform == "darwin" and python_version < version.parse("3.10"),
+    reason="interface not supported on macOS with Python < 3.10",
+)
 class TestDeepLabCutInterfaceNoConfigFile(DataInterfaceTestMixin):
     data_interface_cls = DeepLabCutInterface
     interface_kwargs = dict(
@@ -391,6 +407,10 @@ def check_read_nwb(self, nwbfile_path: str):
             assert all(expected_pose_estimation_series_are_in_nwb_file)
 
 
+@pytest.mark.skipif(
+    platform == "darwin" and python_version < version.parse("3.10"),
+    reason="interface not supported on macOS with Python < 3.10",
+)
 class TestDeepLabCutInterfaceSetTimestamps(DeepLabCutInterfaceMixin):
     data_interface_cls = DeepLabCutInterface
     interface_kwargs = dict(