Merge pull request #665 from KIAaze/fix_packaging_ubu20.04

Fix packaging on *ubuntu 20.04 (more specifically python version >=3.8)
Add distro to requirements and use for packaging
2025-05-07 17:29:50 +00:00 · 2020-06-24 18:47:09 -05:00 · 2020-06-24 18:39:06 -05:00 · 2020-06-24 18:30:30 -05:00 · 2020-06-25 01:23:03 +02:00 · 2020-06-24 17:18:49 -05:00
4 changed files with 8 additions and 6 deletions
--- a/core/app.py
+++ b/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):
--- a/hscommon/build.py
+++ b/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))

--- a/package.py
+++ b/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":
--- a/requirements.txt
+++ b/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
Author	SHA1	Message	Date
Andrew Senetar	7658cdafbc	Merge pull request #665 from KIAaze/fix_packaging_ubu20.04 Fix packaging on *ubuntu 20.04 (more specifically python version >=3.8)	2020-06-24 18:47:09 -05:00
Andrew Senetar	ecf005fad0	Add distro to requirements and use for packaging - Add distro as a requirement - Use distro.id() to get the id as it is a bit cleaner than distro.linux_distribution()	2020-06-24 18:39:06 -05:00
Andrew Senetar	de0542d2a8	Merge pull request #677 from glubsy/fix_folder Fix standard mode folder comparison view generating "---" in results table	2020-06-24 18:30:30 -05:00
glubsy	bcb26507fe	Remove superfluous argument	2020-06-25 01:23:03 +02:00
Andrew Senetar	c35db7f698	Merge pull request #672 from jpvlsmv/variable_fix_trivial Rename an ell variable into something that flake8 doesn't complain about	2020-06-24 17:18:49 -05:00
Andrew Senetar	d2193328a7	Add `e` to `lin`	2020-06-24 17:11:09 -05:00
glubsy	ed64428c80	Add missing file class for folder type. * results.py doesn't set the proper type for dupes at the line "file = get_file(path)" so we add it on top * Perhap it could have been added to _get_fileclasses() in core.app.py too but I have not tested it	2020-06-24 23:32:04 +02:00
glubsy	e89156e55c	Add temporary workaround for bug #676 * In standard mode, for folder comparison, dupe type is wrongly set as core.fs.Folder while it should be core.se.fs.Folder. * Catching the NotImplementedError exception redirects to the appropriate handler * This is only a temporary workaround until a better fix is implemented	2020-06-24 22:01:30 +02:00
Joe Moore	b048fa5968	Rename an ell variable into something that flake8 doesn't complain about	2020-06-05 19:44:08 -04:00
KIAaze	0e8cd32a6e	Changed to -F option to build everything (source and binary packages).	2020-05-20 23:15:49 +01:00
KIAaze	ea191a8924	Fixed AttributeError in the packaging script when using python>=3.8. platform.dist() is deprecated since python version 3.5 and was removed in version 3.8. Added exception to use the distro package in that case, as suggested by the python documentation: https://docs.python.org/3.7/library/platform.html?highlight=platform#module-platform	2020-05-20 23:13:11 +01:00