Correctly configure for system provided libraries

Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>

Author: AyanSinhaMahapatra

.github/workflows/test-ci-mac.yml

@@ -4,12 +4,13 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.10", "3.11"]
+        os: [macos-14, macos-15]
+        python-version: ["3.10", "3.14"]
 
     steps:
       - name: Checkout code
@@ -26,10 +27,7 @@ jobs:
           brew install p7zip libarchive libmagic
 
       - name: Set up venv
-        run: |
-          python3 -m venv venv
-          source venv/bin/activate
-          pip install -e .[system_provided,testing]
+        run: ./configure --dev-system-provided
 
       - name: Run tests
         run: venv/bin/pytest -n 3 -vvs .

configure

@@ -30,6 +30,7 @@ CLI_ARGS=$1
 # Requirement arguments passed to pip and used by default or with --dev.
 REQUIREMENTS="--editable . --constraint requirements.txt"
 DEV_REQUIREMENTS="--editable .[dev,full] --constraint requirements.txt --constraint requirements-dev.txt"
+DEV_SYSTEM_REQUIREMENTS="--editable .[dev,system_provided] --constraint requirements.txt --constraint requirements-dev.txt"
 
 # where we create a virtualenv
 VIRTUALENV_DIR=venv
@@ -185,6 +186,7 @@ while getopts :-: optchar; do
                 help  ) cli_help;;
                 clean ) find_python && clean;;
                 dev   ) CFG_REQUIREMENTS="$DEV_REQUIREMENTS";;
+                dev-system-provided   ) CFG_REQUIREMENTS="$DEV_SYSTEM_REQUIREMENTS";;
             esac;;
     esac
 done

tests/filetype_test_utils.py

@@ -124,7 +124,7 @@ def to_dict(self, filter_empty=False, filter_extra=False, normalize_filetype=Tru
         fields_filter = attr.filters.exclude(*filtered)
 
         if normalize_filetype:
-            split_filetype_file = self.filetype_file.split(' ')
+            split_filetype_file = self.filetype_file.split(" ")
             if split_filetype_file:
                 self.filetype_file = split_filetype_file[0]
 

tests/test_contenttype.py

@@ -141,9 +141,9 @@ def test_package_json(self):
         expected = (
             "ascii text, with very long lines",
             # libmagic 5.39+
-            'json data',
+            "json data",
             # Apple Silicon Homebrew libmagic
-            'json text data',
+            "json text data",
         )
 
         assert get_filetype(test_file) in expected
@@ -295,14 +295,14 @@ def test_doc_postscript_eps(self):
             get_mimetype_file=get_mimetype_file(test_file),
         )
         expected = dict(
-            get_filetype_file='DOS EPS Binary File',
+            get_filetype_file="DOS EPS Binary File",
             get_mimetype_file=(
-                'application/octet-stream',
-                'image/x-eps',
-            )
+                "application/octet-stream",
+                "image/x-eps",
+            ),
         )
-        assert expected['get_filetype_file'] in results['get_filetype_file']
-        assert results['get_mimetype_file'] in expected['get_mimetype_file']
+        assert expected["get_filetype_file"] in results["get_filetype_file"]
+        assert results["get_mimetype_file"] in expected["get_mimetype_file"]
 
     def test_media_image_img(self):
         test_file = self.get_test_loc("contenttype/media/Image1.img")
@@ -327,9 +327,9 @@ def test_package_debian(self):
             # libmagic 5.38
             "debian binary package (format 2.0), with control.tar.gz, data compression gz",
             # libmagic 5.2x
-            'debian binary package (format 2.0)',
+            "debian binary package (format 2.0)",
             # Apple Silicon Homebrew libmagic
-            'debian binary package (format 2.0), with control.tar.gz , data compression gz',
+            "debian binary package (format 2.0), with control.tar.gz , data compression gz",
         )
         assert get_filetype(test_file) in expected
         assert is_binary(test_file)