From 4eb03e246cc8c9d617a1900f75c5d3b8f33b8456 Mon Sep 17 00:00:00 2001
From: Ben Pettit <benpettit@digimulti.com>
Date: Sat, 22 Jun 2024 17:40:13 +1000
Subject: [PATCH] try installing conda

---
 .github/workflows/test.yml | 14 +++++++++++++-
 requirements.txt           |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 678c8b4f..2b4be5ac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Test
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop, 'dev/*' ]
   pull_request:
     branches: [ master, develop ]
 
@@ -99,6 +99,18 @@ jobs:
       if: "startsWith(runner.os, 'Linux')"
       run: |
         make install-deps-wxpython
+    - name: Install MacOS dependencies
+      if: "startsWith(runner.os, 'macOS')"
+      uses: goanpeca/setup-miniconda@v3
+      with:
+        auto-activate-base: true
+        python-version: 3.9  # You can specify your Python version here
+        activate-environment: myenv
+        channels: conda-forge
+        miniconda-version: "latest"
+    - name: Install PyTables via Conda for MacOS
+      if: "startsWith(runner.os, 'macOS')"
+      run: conda install -y pytables
     - name: Install dependencies
       run: |
         make build
diff --git a/requirements.txt b/requirements.txt
index 1e5ee512..4f05b951 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 ## ~~ Analysis Requirements ~~ 
 
 #keyboard requires pyobjc, psychopy requires version less than 8.
-pyobjc==7.3; platform_system == "macOS"
+#pyobjc==7.3; platform_system == "macOS"
 scikit-learn>=0.23.2
 pandas>=1.1.4
 numpy>=1.19.4,<1.24  # due to outdated libs not changing the names after: https://github.com/numpy/numpy/pull/22607
@@ -38,6 +38,8 @@ h5py>=3.1.0
 pytest-shutil
 pyo>=1.0.3; platform_system == "Linux"
 keyboard==0.13.5
+#keyboard was crashing on Carbon.CFDataGetBytes(k_layout, CFRange(0, k_layout_size), ctypes.byref(k_layout_buffer))
+#keyboard==0.13.6; platform_system == "macOS"
 airium>=0.1.0
 attrdict>=2.0.1
 attrdict3
@@ -59,8 +61,6 @@ pyserial>=3.5
 h5py>=3.1.0
 pytest-shutil
 pyo>=1.0.3; platform_system == "Linux"
-#keyboard requires pyobjc, psychopy requires version less than 8.
-pyobjc==7.3; platform_system == "macOS"
 keyboard==0.13.5
 #keyboard was crashing on Carbon.CFDataGetBytes(k_layout, CFRange(0, k_layout_size), ctypes.byref(k_layout_buffer))
 #keyboard==0.13.6; platform_system == "macOS"