try one shell

pellet · Jun 21, 2024 · 8f4fb60 · 8f4fb60
1 parent 8e9dba4
commit 8f4fb60
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,21 +52,6 @@ jobs:
       if: "startsWith(runner.os, 'Linux')"
       run: |
         make install-deps-wxpython
-    - name: Install micromamba to install pytables.
-      if: "startsWith(runner.os, 'MacOS')"
-      run: |
-        brew install micromamba
-        /opt/homebrew/opt/micromamba/bin/micromamba shell init -s bash -p ~/micromamba
-        source ~/.bash_profile
-        micromamba create -y -n EEG-ExPy
-        micromamba activate EEG-ExPy
-        micromamba install -y pytables -c conda-forge
-        micromamba list
-        pip list
-        micromamba activate EEG-ExPy
-        micromamba list
-        pip list
-        
     - name: Install dependencies
       run: |
         make build
@@ -114,11 +99,10 @@ jobs:
       if: "startsWith(runner.os, 'Linux')"
       run: |
         make install-deps-wxpython
-    - name: Install dependencies
+    - name: Install MacOS dependencies
+      if: "startsWith(runner.os, 'MacOS')"
       run: |
-        micromamba env list
-        micromamba activate EEG-ExPy
-        make build
+        make build-mac
     - name: Typecheck
       run: |
         make typecheck
diff --git a/Makefile b/Makefile
@@ -2,6 +2,19 @@ build:
 	# Use pep517 to install pygatt==4.0.5(deprecated setuptools/egg installer) on macos
 	pip install --use-pep517 .
 
+build-mac:
+	brew install micromamba
+	/opt/homebrew/opt/micromamba/bin/micromamba shell init -s bash -p ~/micromamba
+	source ~/.bash_profile
+	micromamba create -y -n EEG-ExPy
+	micromamba activate EEG-ExPy
+	micromamba install -y pytables -c conda-forge
+	# Use pep517 to install pygatt==4.0.5(deprecated setuptools/egg installer) on macos
+	pip install --use-pep517 .
+
+build:
+	pip install .
+
 test:
 	pytest