Merged main, removed torch flags on cellfinder install for guards and…

… brainmapper

.github/workflows/test_and_deploy.yml

@@ -42,12 +42,10 @@ jobs:
         # Run all supported Python versions on linux
         os: [ubuntu-latest]
         python-version: ["3.9", "3.10", "3.11"]
-        # Include one windows, one macos run each for M1 (latest) and Intel (13)
+        # Include one windows, one macos run (intel based macOS 13 runner)
         include:
         - os: macos-13
           python-version: "3.10"
-        - os: macos-latest
-          python-version: "3.10"
         - os: windows-latest
           python-version: "3.10"
 
@@ -125,8 +123,8 @@ jobs:
       - name: Install test dependencies
         run: |
           python -m pip install --upgrade pip wheel
-          # Install cellfinder from the latest SHA on this branch (Keras with torch backend)
-          python -m pip install "cellfinder[torch] @ git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@$GITHUB_SHA"
+          # Install cellfinder from the latest SHA on this branch
+          python -m pip install "cellfinder @ git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@$GITHUB_SHA"
 
           # Install checked out copy of brainglobe-workflows
           python -m pip install .[dev]

.github/workflows/test_include_guard.yaml

@@ -24,8 +24,8 @@ jobs:
         with:
           python-version: '3.10'
 
-      - name: Install cellfinder via pip, specifying torch as keras' backend
-        run: python -m pip install -e ".[torch]"
+      - name: Install cellfinder via pip
+        run: python -m pip install -e "."
 
       - name: Test (working) import
         uses: jannekem/run-python-script-action@v1