Merge pull request #665 from KIAaze/fix_packaging_ubu20.04

Fix packaging on *ubuntu 20.04 (more specifically python version >=3.8)

core/app.py

@@ -259,7 +259,7 @@ class DupeGuru(Broadcaster):
 
     def _create_file(self, path):
         # We add fs.Folder to fileclasses in case the file we're loading contains folder paths.
-        return fs.get_file(path, self.fileclasses + [fs.Folder])
+        return fs.get_file(path, self.fileclasses + [se.fs.Folder])
 
     def _get_file(self, str_path):
         path = Path(str_path)
@@ -539,8 +539,8 @@ class DupeGuru(Broadcaster):
             return dupe.get_display_info(group, delta)
         except Exception as e:
             logging.warning(
-                "Exception on GetDisplayInfo for %s: %s", str(dupe.path), str(e)
+                "Exception (type: %s) on GetDisplayInfo for %s: %s",
-            )
+                type(e), str(dupe.path), str(e))
             return empty_data()
 
     def invoke_custom_command(self):

hscommon/build.py

@@ -557,7 +557,7 @@ def fix_qt_resource_file(path):
     with open(path, "rb") as fp:
         contents = fp.read()
     lines = contents.split(b"\n")
-    lines = [l for l in lines if not l.startswith(b"#")]
+    lines = [line for line in lines if not line.startswith(b"#")]
     with open(path, "wb") as fp:
         fp.write(b"\n".join(lines))
 

package.py

@@ -12,6 +12,7 @@ import shutil
 import json
 from argparse import ArgumentParser
 import platform
+import distro
 import re
 
 from hscommon.build import (
@@ -90,7 +91,7 @@ def package_debian_distribution(distribution):
     )
     shutil.copy(op.join("images", "dgse_logo_128.png"), srcpath)
     os.chdir(destpath)
-    cmd = "dpkg-buildpackage -S -us -uc"
+    cmd = "dpkg-buildpackage -F -us -uc"
     os.system(cmd)
     os.chdir("../..")
 
@@ -212,7 +213,7 @@ def main():
         package_windows()
     else:
         if not args.arch_pkg:
-            distname, _, _ = platform.dist()
+            distname = distro.id()
         else:
             distname = "arch"
         if distname == "arch":

requirements.txt

@@ -2,3 +2,4 @@ Send2Trash>=1.3.0
 sphinx>=1.2.2
 polib>=1.0.4
 hsaudiotag3k>=1.1.3
+distro>=1.5.0