From dd3434c8b249fe3b1cf4fc4e7a7f769223a6f901 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Thu, 31 Oct 2024 06:36:42 +0000 Subject: [PATCH 1/2] Bump versions Signed-off-by: Jono Yang --- builtins/extractcode_7z_system_provided/setup.py | 2 +- builtins/extractcode_libarchive_system_provided/setup.py | 2 +- builtins/typecode_libmagic_system_provided/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtins/extractcode_7z_system_provided/setup.py b/builtins/extractcode_7z_system_provided/setup.py index adecdec..2ff5710 100755 --- a/builtins/extractcode_7z_system_provided/setup.py +++ b/builtins/extractcode_7z_system_provided/setup.py @@ -14,7 +14,7 @@ setup( name='extractcode_7z_system_provided', - version='32.0.0', + version='33.0.0', license='apache-2.0 AND lgpl-2.1 and unrar and brian-gladman-3-clause', description=desc, long_description=desc, diff --git a/builtins/extractcode_libarchive_system_provided/setup.py b/builtins/extractcode_libarchive_system_provided/setup.py index bed1eb6..d732af1 100755 --- a/builtins/extractcode_libarchive_system_provided/setup.py +++ b/builtins/extractcode_libarchive_system_provided/setup.py @@ -14,7 +14,7 @@ setup( name='extractcode_libarchive_system_provided', - version='32.0.0', + version='33.0.0', license='apache-2.0 AND bsd-simplified', description=desc, long_description=desc, diff --git a/builtins/typecode_libmagic_system_provided/setup.py b/builtins/typecode_libmagic_system_provided/setup.py index 9aafcb3..7e85dbe 100755 --- a/builtins/typecode_libmagic_system_provided/setup.py +++ b/builtins/typecode_libmagic_system_provided/setup.py @@ -14,7 +14,7 @@ setup( name='typecode_libmagic_system_provided', - version='32.0.0', + version='33.0.0', license=( 'apache-2.0 AND bsd-simplified-darwin AND (bsd-simplified AND public-domain AND ' 'bsd-new AND isc AND (bsd-new OR gpl-1.0-plus) AND bsd-original)' From bd0368463287861c66742b27992d8e43cf2470d6 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Thu, 31 Oct 2024 12:25:44 -0700 Subject: [PATCH 2/2] Update code formatting Signed-off-by: Jono Yang --- .../src/extractcode_7z/__init__.py | 7 ++++--- .../src/extractcode_libarchive/__init__.py | 12 ++++++++---- .../src/typecode_libmagic/__init__.py | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py b/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py index a4874ae..db3d6ed 100755 --- a/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py +++ b/builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py @@ -19,10 +19,10 @@ class SevenzipPaths(LocationProviderPlugin): def get_like_distro(self): info = platform.freedesktop_os_release() - ids = [info["ID"]] - if "ID_LIKE" in info: + ids = [info['ID']] + if 'ID_LIKE' in info: # ids are space separated and ordered by precedence - ids.extend(info["ID_LIKE"].split()) + ids.extend(info['ID_LIKE'].split()) return ids @@ -46,6 +46,7 @@ def get_locations(self): lib_dir = '/usr/bin' lib_7z = path.join(lib_dir, '7z') elif any(dist in rpm_based_distro for dist in distribution): + # 7zip proper is not available on dnf lib_dir = '/usr/libexec/p7zip' lib_7z = path.join(lib_dir, '7za') else: diff --git a/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py b/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py index ca9f2ae..41ba7f6 100755 --- a/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py +++ b/builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py @@ -41,12 +41,16 @@ def get_locations(self): rpm_based_distro = ['fedora', 'rhel'] if any(dist in debian_based_distro for dist in distribution): - db_dir = '/usr/lib/file' - lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib/'+system_arch+'-linux-gnu' + lib_dir = ( + '/usr/lib' if platform.architecture()[0] == '32bit' + else f'/usr/lib/{system_arch}-linux-gnu' + ) elif any(dist in rpm_based_distro for dist in distribution): - db_dir = '/usr/share/misc' - lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64' + lib_dir = ( + '/usr/lib' if platform.architecture()[0] == '32bit' + else '/usr/lib64' + ) else: raise Exception( diff --git a/builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py b/builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py index 8c53393..b1dd5aa 100755 --- a/builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py +++ b/builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py @@ -32,10 +32,10 @@ class LibmagicPaths(LocationProviderPlugin): def get_like_distro(self): info = platform.freedesktop_os_release() - ids = [info["ID"]] - if "ID_LIKE" in info: + ids = [info['ID']] + if 'ID_LIKE' in info: # ids are space separated and ordered by precedence - ids.extend(info["ID_LIKE"].split()) + ids.extend(info['ID_LIKE'].split()) return ids def get_locations(self): @@ -53,11 +53,17 @@ def get_locations(self): if any(dist in debian_based_distro for dist in distribution): db_dir = '/usr/lib/file' - lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib/'+system_arch+'-linux-gnu' + lib_dir = ( + '/usr/lib' if platform.architecture()[0] == '32bit' + else f'/usr/lib/{system_arch}-linux-gnu' + ) elif any(dist in rpm_based_distro for dist in distribution): db_dir = '/usr/share/misc' - lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64' + lib_dir = ( + '/usr/lib' if platform.architecture()[0] == '32bit' + else '/usr/lib64' + ) else: raise Exception('Unsupported system: {}'.format(distribution)) @@ -100,5 +106,5 @@ def get_locations(self): 'typecode.libmagic.libdir': lib_dir, 'typecode.libmagic.dll': dll_loc, 'typecode.libmagic.db': magicdb_loc, - } + } return locations