From c3436e8a46c44893534d5ae64854085dd21483c2 Mon Sep 17 00:00:00 2001
From: CBroz1 <CBrozdowski@yahoo.com>
Date: Tue, 21 May 2024 14:19:10 -0500
Subject: [PATCH] WIP: Run tests on main

---
 .github/workflows/test-conda.yml         |  5 +----
 .github/workflows/test-package-build.yml |  2 ++
 pyproject.toml                           | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-conda.yml b/.github/workflows/test-conda.yml
index 7dcd0b8da..e28b59366 100644
--- a/.github/workflows/test-conda.yml
+++ b/.github/workflows/test-conda.yml
@@ -42,7 +42,7 @@ jobs:
         miniforge-version: latest
     - name: Install spyglass
       run: |
-        pip install -e .[test]
+        pip install -e .[test,dlc]
     - name: Download data
       env:
         UCSF_BOX_TOKEN: ${{ secrets.UCSF_BOX_TOKEN }}
@@ -51,9 +51,6 @@ jobs:
         RAW_DIR: /home/runner/work/spyglass/spyglass/tests/_data/raw/ 
         VIDEO_DIR: /home/runner/work/spyglass/spyglass/tests/_data/video/ 
         DLC_DIR: /home/runner/work/spyglass/spyglass/tests/_data/deeplabcut/ 
-        QT_QPA_PLATFORM: offscreen # QT fails on CBroz's machine otherwise
-        TF_ENABLE_ONEDNN_OPTS: 0 # TF disable approx calcs
-        TF_CPP_MIN_LOG_LEVEL: 2 # Disable TF warnings
       run: |
         mkdir -p $RAW_DIR $VIDEO_DIR $DLC_DIR
         wget --recursive --no-verbose --no-host-directories --no-directories \
diff --git a/.github/workflows/test-package-build.yml b/.github/workflows/test-package-build.yml
index 0098982cb..3758e66b2 100644
--- a/.github/workflows/test-package-build.yml
+++ b/.github/workflows/test-package-build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - main
       - maint/*
       - '!test_branch'
       - '!documentation'
@@ -12,6 +13,7 @@ on:
   pull_request:
     branches:
       - master
+      - main
       - maint/*
 defaults:
   run:
diff --git a/pyproject.toml b/pyproject.toml
index 75ea034fe..646720351 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -148,19 +148,19 @@ omit = [ # which submodules have no tests
     "*/__init__.py",
     "*/_version.py",
     "*/cli/*",
-    "*/common/*", # UNDO
+    # "*/common/*",
     "*/data_import/*",
     "*/decoding/*",
     "*/figurl_views/*",
-    "*/lfp/*", # UNDO
-    "*/linearization/*", # UNDO
+    # "*/lfp/*",
+    # "*/linearization/*",
     "*/lock/*",
     "*/mua/*",
-    # "*/position/*", # UNDO
+    # "*/position/*",
     "*/ripple/*",
     "*/sharing/*",
     "*/spikesorting/*",
-    "*/utils/*", # UNDO
+    # "*/utils/*",
     "settings.py",
 ]