Merge pull request #40 from aboutcode-org/system-provided

Add system_provided to extra_requires

Author: AyanSinhaMahapatra

.github/workflows/test-ci-linux-arm.yml

@@ -0,0 +1,33 @@
+name: Test CI Linux ARM
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      max-parallel: 2
+      matrix:
+        os: [ubuntu-24.04-arm]
+        python-version: ["3.10", "3.14"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          sudo apt update
+          sudo apt install libarchive-tools libarchive-dev libmagic1 libmagic-dev 
+
+      - name: Set up venv
+        run: ./configure --dev-system-provided
+
+      - name: Run tests
+        run: venv/bin/pytest -n 3 -vvs .

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

@@ -0,0 +1,33 @@
+name: Test CI Macos ARM
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        os: [macos-14, macos-15]
+        python-version: ["3.10", "3.14"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          brew update
+          brew install libarchive libmagic
+
+      - name: Set up venv
+        run: ./configure --dev-system-provided
+
+      - name: Run tests
+        run: venv/bin/pytest -n 3 -vvs .

.gitignore

@@ -56,7 +56,6 @@ pyvenv.cfg
 
 # Various junk and temp files
 .DS_Store
-*~
 .*.sw[po]
 .build
 .ve

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

setup.cfg

@@ -67,6 +67,9 @@ where = src
 full =
     typecode_libmagic >= 5.39.210223
 
+system_provided =
+    typecode_libmagic_system_provided >= 32.0.0
+
 dev =
     pytest >= 7.0.1
     pytest-xdist >= 2

src/typecode/contenttype.py

@@ -163,7 +163,7 @@ class Type(object):
     )
 
     # FIXME: we should use an introspectable attrs class instead
-    # ATTENTION: keep this in sync with sloats and properties
+    # ATTENTION: keep this in sync with slots and properties
     text_attributes = [
         "filetype_file",
         "mimetype_file",

tests/data/filetest/archive/a.tar.gz.yml

@@ -1,4 +1,4 @@
-filetype_file: gzip compressed data, last modified
+filetype_file: gzip compressed data
 mimetype_file: application/gzip
 mimetype_python: application/x-tar
 is_file: yes

tests/data/filetest/archive/e.tar.bz2.yml

@@ -1,4 +1,4 @@
-filetype_file: bzip2 compressed data, block size = 900k
+filetype_file: bzip2 compressed data
 mimetype_file: application/x-bzip2
 mimetype_python: application/x-tar
 is_file: yes

tests/data/filetest/archive/e.tar.gz.yml

@@ -1,4 +1,4 @@
-filetype_file: gzip compressed data, last modified
+filetype_file: gzip compressed data
 mimetype_file: application/gzip
 mimetype_python: application/x-tar
 is_file: yes

tests/data/filetest/archive/file_4.26-1.diff.gz.yml

@@ -1,4 +1,4 @@
-filetype_file: gzip compressed data, last modified
+filetype_file: gzip compressed data
 mimetype_file: application/gzip
 is_file: yes
 is_regular: yes