Merge pull request #47 from aboutcode-org/system-provided-plugins-release-prep

System provided plugins release prep

Author: JonoYang

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,

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:

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,

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(

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)'

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