python-magic-bin only compatible with intel osx. add libmagic install…

… to macos test deps; only use python-magic-bin for win
NVIDIA · Aug 1, 2024 · 4d616fb · 4d616fb
1 parent f82fd8a
commit 4d616fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
@@ -25,6 +25,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          brew install libmagic
           cd garak
           python -m pip install --upgrade pip
           pip install -r requirements.txt

diff --git a/pyproject.toml b/pyproject.toml
@@ -68,8 +68,8 @@ dependencies = [
   "litellm>=1.33.8",
   "jsonpath-ng>=1.6.1",
   "huggingface_hub>=0.21.0",
-  'python-magic-bin; sys_platform == "win32" or sys_platform == "darwin"',
-  'python-magic>=0.4.21; sys_platform != "win32" and sys_platform != "darwin"',
+  'python-magic-bin; sys_platform == "win32"',
+  'python-magic>=0.4.21; sys_platform != "win32"',
   "lorem==0.1.1",
   "xdg-base-dirs>=6.0.1",
 ]

diff --git a/requirements.txt b/requirements.txt
@@ -29,8 +29,8 @@ fschat>=0.2.36
 litellm>=1.33.8
 jsonpath-ng>=1.6.1
 huggingface_hub>=0.21.0
-python-magic-bin; sys_platform == "win32" or sys_platform == "darwin"
-python-magic>=0.4.21; sys_platform != "win32" and sys_platform != "darwin"
+python-magic-bin; sys_platform == "win32"
+python-magic>=0.4.21; sys_platform != "win32"
 lorem==0.1.1
 xdg-base-dirs>=6.0.1
 # tests