From 80ac4b5f8d472ac9b4258447bb4a79fa042a4399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Arnauts?= <michael.arnauts@gmail.com>
Date: Wed, 26 Jul 2023 15:42:00 +0200
Subject: [PATCH] Drop testing for Python 2.7 (#56)

* Drop support for Python 2.7
---
 .github/workflows/ci.yml | 5 -----
 .pylintrc                | 7 ++++++-
 scripts/build.py         | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28da61d..f5edc61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,17 +18,12 @@ jobs:
         python-version: ["3.8", "3.9", "3.10"]
         include:
           # End-of-life Python versions are not available anymore with ubuntu-latest
-          - os: ubuntu-20.04
-            python-version: "2.7"
           - os: ubuntu-20.04
             python-version: "3.5"
           - os: ubuntu-20.04
             python-version: "3.6"
           - os: ubuntu-20.04
             python-version: "3.7"
-          # Kodi Leia on Windows uses a bundled Python 2.7.
-          - os: windows-latest
-            python-version: "2.7"
     steps:
       - name: Check out ${{ github.sha }} from repository ${{ github.repository }}
         uses: actions/checkout@v3
diff --git a/.pylintrc b/.pylintrc
index cbd69ca..8978d88 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -8,6 +8,7 @@ disable=
     line-too-long,
     no-init,
     old-style-class,
+    super-with-arguments,
     too-few-public-methods,
     too-many-arguments,
     too-many-branches,
@@ -17,8 +18,12 @@ disable=
     too-many-statements,
     use-maxsplit-arg,
     consider-using-from-import,
+    unspecified-encoding,
+    broad-exception-raised,
+    use-dict-literal,
 
     super-with-arguments, # Python 2.7 compatibility
     raise-missing-from, # Python 2.7 compatibility
     consider-using-f-string, # Python 2.7 compatibility
-    unspecified-encoding, # Python 2.7 compatibility
\ No newline at end of file
+    unspecified-encoding, # Python 2.7 compatibility
+    consider-iterating-dictionary, # Python 2.7 compatibility
diff --git a/scripts/build.py b/scripts/build.py
index 0eb268f..af9c00a 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -5,10 +5,8 @@
 
 import os
 import shutil
-import sys
 import xml.etree.ElementTree as ET
 
-BRANDS_DIR = 'brands'
 DIST_DIR = 'dist'
 
 
@@ -85,5 +83,5 @@ def modify_xml(file, version, news, python=None):
     shutil.make_archive(os.path.join(DIST_DIR, "%s-%s+matrix.1" % (brand, addon_info['version'])), 'zip', DIST_DIR, brand)
 
     # Modify addon.xml for leia and create zip
-    modify_xml(os.path.join(dest, 'addon.xml'), addon_info['version'], addon_info['news'], '2.26.0')
-    shutil.make_archive(os.path.join(DIST_DIR, "%s-%s" % (brand, addon_info['version'])), 'zip', DIST_DIR, brand)
+    # modify_xml(os.path.join(dest, 'addon.xml'), addon_info['version'], addon_info['news'], '2.26.0')
+    # shutil.make_archive(os.path.join(DIST_DIR, "%s-%s" % (brand, addon_info['version'])), 'zip', DIST_DIR, brand)