From 59853cfc88bc733126cd2b5a385d0f137684a152 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Thu, 16 May 2024 15:31:50 -0700 Subject: [PATCH] Update configure script to install system_requires extra_requires on mac arm64 * Bump commoncode version Signed-off-by: Jono Yang --- configure | 6 +++++- setup-mini.cfg | 8 ++++---- setup.cfg | 14 ++++++++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 97a37ff3a1f..152053b4405 100755 --- a/configure +++ b/configure @@ -139,7 +139,11 @@ BASE=".[packages]" BASE_DEV=".[packages,testing]" if [[ $OSTYPE == 'darwin'* ]]; then BASE="." - BASE_DEV=".[testing]" + if [[ $(uname -m) == 'arm64' ]]; then + BASE_DEV=".[system_provided,testing]" + else + BASE_DEV=".[testing]" + fi fi # Requirement arguments passed to pip and used by default or with --dev. diff --git a/setup-mini.cfg b/setup-mini.cfg index cf4dffa2a51..e32a96a7503 100644 --- a/setup-mini.cfg +++ b/setup-mini.cfg @@ -70,7 +70,7 @@ install_requires = chardet >= 3.0.0 click >= 6.7, !=7.0 colorama >= 0.3.9 - commoncode >= 31.0.3 + commoncode >= 31.2.1 container-inspector >= 31.0.0 debian-inspector >= 31.1.0 dparse2 >= 0.7.0 @@ -126,9 +126,9 @@ full = extractcode[full] >= 31.0.0 system_provided = - typecode_libmagic-system-provided - extractcode_7z_system_provided - extractcode_libarchive_system_provided + typecode_libmagic-system-provided >= 32.0.0 + extractcode_7z_system_provided >= 32.0.0 + extractcode_libarchive_system_provided >= 32.0.0 testing = pytest >= 6, != 7.0.0 diff --git a/setup.cfg b/setup.cfg index 3a095718c1b..ca44047a832 100644 --- a/setup.cfg +++ b/setup.cfg @@ -70,7 +70,7 @@ install_requires = chardet >= 3.0.0 click >= 6.7, !=7.0 colorama >= 0.3.9 - commoncode >= 31.0.3 + commoncode >= 31.2.1 container-inspector >= 31.0.0 debian-inspector >= 31.1.0 dparse2 >= 0.7.0 @@ -112,9 +112,8 @@ install_requires = xmltodict >= 0.11.0 zipp >= 3.0.0; python_version < "3.9" typecode >= 30.0.1 - typecode[full] >= 30.0.1 - extractcode[full] >= 31.0.0 - + typecode[full] >= 30.0.1; sys_platform != "darwin" and platform_machine != "arm64" + extractcode[full] >= 31.0.0; sys_platform != "darwin" and platform_machine != "arm64" [options.packages.find] where = src @@ -125,6 +124,13 @@ full = typecode[full] >= 30.0.0 extractcode[full] >= 31.0.0 +system_provided = + typecode >= 30.0.1 + extractcode >= 31.0.0 + typecode_libmagic_system_provided >= 32.0.0 + extractcode_7z_system_provided >= 32.0.0 + extractcode_libarchive_system_provided >= 32.0.0 + testing = pytest >= 6, != 7.0.0 pytest-xdist >= 2