Test linux/macos ARM support

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

Author: AyanSinhaMahapatra

Makefile

@@ -22,6 +22,10 @@ dev:
 	@echo "-> Configure and install development dependencies"
 	./configure --dev
 
+dev-system-provided:
+	@echo "-> Configure and install development dependencies"
+	./configure --dev-system-provided
+
 doc8:
 	@echo "-> Run doc8 validation"
 	@${ACTIVATE} doc8 --quiet docs/ *.rst

README.rst

@@ -273,8 +273,14 @@ Archive format kind: docs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   name: Office doc
-     - extensions: .docx, .dotx, .docm, .xlsx, .xltx, .xlsm, .xltm, .pptx, .ppsx, .potx, .pptm, .potm, .ppsm, .odt, .odf, .sxw, .stw, .ods, .ots, .sxc, .stc, .odp, .otp, .odg, .otg, .sxi, .sti, .sxd, .sxg, .std, .sdc, .sda, .sdd, .smf, .sdw, .sxm, .stw, .oxt, .sldx, .epub
-     - filetypes : zip archive, microsoft word 2007+, microsoft excel 2007+, microsoft powerpoint 2007+
+     - extensions:
+         .docx, .dotx, .docm, .xlsx, .xltx, .xlsm, .xltm, .pptx, .ppsx, .potx,
+         .pptm, .potm, .ppsm, .odt, .odf, .sxw, .stw, .ods, .ots, .sxc, .stc,
+         .odp, .otp, .odg, .otg, .sxi, .sti, .sxd, .sxg, .std,
+         .sdc, .sda, .sdd, .smf, .sdw, .sxm, .stw, .oxt, .sldx, .epub
+     - filetypes :
+         zip archive, microsoft word 2007+,
+         microsoft excel 2007+, microsoft powerpoint 2007+
      - mimetypes : application/zip, application/vnd.openxmlformats
 
   name: Dia diagram doc

azure-pipelines.yml

@@ -9,7 +9,7 @@ jobs:
     parameters:
         job_name: run_code_checks
         image_name: ubuntu-24.04
-        python_versions: ['3.13']
+        python_versions: ['3.14']
         test_suites:
             all: make check
 
@@ -22,26 +22,47 @@ jobs:
             all:
               sudo chmod 0644 /boot/vmlinuz-* && sudo apt install libguestfs-tools
               && venv/bin/pytest -n 2 -vvs
+
   - template: etc/ci/azure-posix.yml
     parameters:
         job_name: ubuntu24_cpython
         image_name: ubuntu-24.04
         python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
+        test_suites:
+            all:
+              sudo chmod 0644 /boot/vmlinuz-* && sudo apt install libguestfs-tools
+              && venv/bin/pytest -n 2 -vvs
+
+  - template: etc/ci/azure-posix-arm.yml
+    parameters:
+        job_name: ubuntu24_cpython
+        image_name: ubuntu-24.04-arm
+        python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
+        test_suites:
+            all:
+              sudo chmod 0644 /boot/vmlinuz-* && sudo apt install libguestfs-tools
+              && venv/bin/pytest -n 2 -vvs
+
+  - template: etc/ci/azure-posix-arm.yml
+    parameters:
+        job_name: macos14_cpython
+        image_name: macos-14
+        python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
         test_suites:
             all: venv/bin/pytest -n 2 -vvs
 
-  - template: etc/ci/azure-posix.yml
+  - template: etc/ci/azure-posix-arm.yml
     parameters:
-        job_name: macos13_cpython
-        image_name: macOS-13
+        job_name: macos15_cpython
+        image_name: macosS-15
         python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
         test_suites:
             all: venv/bin/pytest -n 2 -vvs
 
-  - template: etc/ci/azure-posix.yml
+  - template: etc/ci/azure-posix-arm.yml
     parameters:
-        job_name: macos14_cpython
-        image_name: macOS-14
+        job_name: macos15_cpython
+        image_name: macos-15-intel
         python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
         test_suites:
             all: venv/bin/pytest -n 2 -vvs

configure

@@ -29,7 +29,8 @@ CLI_ARGS=$1
 
 # Requirement arguments passed to pip and used by default or with --dev.
 REQUIREMENTS="--editable . --constraint requirements.txt"
-DEV_REQUIREMENTS="--editable .[dev] --constraint requirements.txt --constraint requirements-dev.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
@@ -184,6 +185,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

etc/ci/azure-posix-arm.yml

@@ -0,0 +1,39 @@
+parameters:
+    job_name: ''
+    image_name: ''
+    python_versions: []
+    test_suites: {}
+    python_architecture: aarch64
+
+jobs:
+    - job: ${{ parameters.job_name }}
+
+      pool:
+          vmImage: ${{ parameters.image_name }}
+
+      strategy:
+          matrix:
+              ${{ each tsuite in parameters.test_suites }}:
+                 ${{ tsuite.key }}:
+                     test_suite_label: ${{ tsuite.key }}
+                     test_suite: ${{ tsuite.value }}
+
+      steps:
+          - checkout: self
+            fetchDepth: 10
+
+          - ${{ each pyver in parameters.python_versions }}:
+              - task: UsePythonVersion@0
+                inputs:
+                    versionSpec: '${{ pyver }}'
+                    architecture: '${{ parameters.python_architecture }}'
+                displayName: '${{ pyver }} - Install Python'
+
+              - script: |
+                    python${{ pyver }} --version
+                    echo "python${{ pyver }}" > PYTHON_EXECUTABLE
+                    ./configure --clean && ./configure --dev-system-provided
+                displayName: '${{ pyver }} - Configure'
+
+              - script: $(test_suite)
+                displayName: '${{ pyver }} - $(test_suite_label) on ${{ parameters.job_name }}'

requirements.txt

@@ -66,8 +66,7 @@ soupsieve==2.8
 spdx-tools==0.7.0rc0
 text-unidecode==1.3
 toml==0.10.2
-typecode==30.0.2
-typecode-libmagic==5.39.210531
+typecode==30.2.0
 typing_extensions==4.15.0
 urllib3==2.5.0
 urlpy==0.5

setup.cfg

@@ -1,5 +1,6 @@
 [metadata]
 name = extractcode
+version = 31.1.0
 license = Apache-2.0
 
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390
@@ -70,7 +71,7 @@ install_requires =
     attrs >= 22.1.0;python_version>='3.11'
     commoncode >= 31.0.2
     plugincode >= 32.0.0
-    typecode >= 30.0.1
+    typecode >= 30.2.0
 
 [options.packages.find]
 where = src
@@ -80,7 +81,12 @@ where = src
 full =
     extractcode-7z >= 16.5.210525
     extractcode_libarchive >= 3.5.1.210525
-    typecode[full] >= 30.0.1
+    typecode[full] >= 30.2.0
+
+system_provided =
+    extractcode-7z_system_provided >= 32.0.0
+    extractcode_libarchive_system_provided >= 32.0.0
+    typecode[system_provided] >= 30.2.0
 
 patch =
     patch >= 1.16
@@ -93,10 +99,13 @@ dev =
     black
     isort
     ruff
-    Sphinx == 5.1.0
+    Sphinx>=5.0.2
     sphinx-rtd-theme>=1.0.0
     sphinx-reredirects >= 0.1.2
     doc8>=0.11.2
+    sphinx-autobuild
+    sphinx-rtd-dark-mode>=1.3.0
+    sphinx-copybutton
 
 [options.entry_points]
 console_scripts =

tests/test_extractcode_cli.py

@@ -276,7 +276,6 @@ def test_extractcode_command_does_not_crash_with_replace_originals_and_corrupted
     result = run_extract(["--replace-originals", "--verbose", test_dir], expected_rc=1)
 
     assert not os.path.exists(os.path.join(test_dir, "rake.1.gz-extract"))
-    assert "rake.1.gz" in result.stdout
 
     assert "Extracting archives..." in result.stderr
     assert "ERROR extracting" in result.stderr