Re-re-remove Proton from Wine versions + cleanup

.travis.yml

@@ -20,6 +20,7 @@ addons:
       - python3-setproctitle
       - python3-distro
       - python3-magic
+      - python3-lxml
       - gir1.2-gtk-3.0
       - psmisc
       - gir1.2-glib-2.0

lutris/services/gog.py

@@ -390,7 +390,7 @@ class GOGService(OnlineService):
         if not links:
             raise UnavailableGame("Could not fing GOG game")
         _installer_files = defaultdict(dict)  # keyed by filename
-        for index, link in enumerate(links):
+        for link in links:
             filename = link["filename"]
             if filename.lower().endswith(".xml"):
                 if filename != installer_file_id:

lutris/startup.py

@@ -15,7 +15,7 @@ from lutris.util.graphics import drivers, vkquery
 from lutris.util.linux import LINUX_SYSTEM
 from lutris.util.log import logger
 from lutris.util.system import create_folder
-from lutris.util.wine.dxvk import fetch_dxvk_versions, DXVKManager
+from lutris.util.wine.dxvk import DXVKManager, fetch_dxvk_versions
 
 
 def init_dirs():

lutris/util/game_finder.py

@@ -14,7 +14,7 @@ except ImportError:
 
 if not hasattr(magic, "from_file"):
     if hasattr(magic, "detect_from_filename"):
-        magic.from_file = magic.detect_from_filename
+        magic.from_file = magic.detect_from_filename  # pylint: disable=no-member
         MAGIC_AVAILABLE = True
     else:
         logger.error("Your version of python-magic is too old.")

lutris/util/wine/dxvk.py

@@ -6,8 +6,8 @@ import shutil
 from lutris.settings import RUNTIME_DIR
 from lutris.util import system
 from lutris.util.extract import extract_archive
-from lutris.util.log import logger
 from lutris.util.http import download_file
+from lutris.util.log import logger
 
 DXVK_RELEASES_URL = "https://api.github.com/repos/lutris/dxvk/releases"
 
@@ -35,6 +35,7 @@ class DXVKManager:
         self.prefix = prefix
         if not os.path.isdir(self.base_dir):
             os.makedirs(self.base_dir)
+        self._versions = []
         self._version = version
         self.wine_arch = arch
 
@@ -105,7 +106,7 @@ class DXVKManager:
         for release in dxvk_releases:
             if release["tag_name"] != self.version:
                 continue
-            return release["assets"][0]["browser_download_url"]        
+            return release["assets"][0]["browser_download_url"]
 
     def download(self):
         """Download DXVK to the local cache"""
@@ -119,7 +120,7 @@ class DXVKManager:
         dxvk_archive_path = os.path.join(self.base_dir, os.path.basename(dxvk_url))
         download_file(dxvk_url, dxvk_archive_path, overwrite=True)
         if not system.path_exists(dxvk_archive_path) or not os.stat(dxvk_archive_path).st_size:
-            logger.error("Failed to download DXVK %s" % self.version)
+            logger.error("Failed to download DXVK %s", self.version)
             return
         extract_archive(dxvk_archive_path, self.dxvk_path, merge_single=True)
         os.remove(dxvk_archive_path)
@@ -170,7 +171,7 @@ class DXVKManager:
     def enable(self):
         """Enable DXVK for the current prefix"""
         if not system.path_exists(self.dxvk_path):
-            logger.error("%s %s is not available locally", self.base_name.upper(), self.version)
+            logger.error("DXVK %s is not available locally", self.version)
             return
         for system_dir, dxvk_arch, dll in self._iter_dxvk_dlls():
             self.enable_dxvk_dll(system_dir, dxvk_arch, dll)

lutris/util/wine/wine.py

@@ -201,7 +201,8 @@ def get_wine_versions():
     versions = []
     versions += get_system_wine_versions()
     versions += get_lutris_wine_versions()
-    versions += get_proton_versions()
+    if os.environ.get("LUTRIS_ENABLE_PROTON"):
+        versions += get_proton_versions()
     versions += get_pol_wine_versions()
     return versions
 
@@ -282,7 +283,7 @@ def is_version_esync(path):
     except IndexError:
         logger.error("Invalid path '%s'", path)
         return False
-    version_number, version_prefix, version_suffix = parse_version(version)
+    _version_number, version_prefix, version_suffix = parse_version(version)
     esync_compatible_versions = ["esync", "lutris", "tkg", "ge", "proton", "staging"]
     for esync_version in esync_compatible_versions:
         if esync_version in version_prefix or esync_version in version_suffix: