Fix CI (#532)

Author: mediaminister

.github/workflows/ci.yml

@@ -18,19 +18,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10' ]
+        python-version: [ '2.7', '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        include:
+          # End-of-life Python versions are not available anymore with ubuntu-latest
+          - os: ubuntu-20.04
+            python-version: '3.5'
+          - os: ubuntu-20.04
+            python-version: '3.6'
     steps:
     - name: Check out ${{ github.sha }} from repository ${{ github.repository }}
       uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         sudo apt-get install gettext
-        sudo pip install coverage --install-option="--install-scripts=/usr/bin"
         python -m pip install --upgrade pip
         pip install -r requirements.txt
     - name: Run tox

lib/inputstreamhelper/__init__.py

@@ -110,7 +110,7 @@ def _get_lib_version(path):
 
     def _has_inputstream(self):
         """Checks if selected InputStream add-on is installed."""
-        data = jsonrpc(method='Addons.GetAddonDetails', params=dict(addonid=self.inputstream_addon))
+        data = jsonrpc(method='Addons.GetAddonDetails', params={'addonid': self.inputstream_addon})
         if 'error' in data:
             log(3, '{addon} is not installed.', addon=self.inputstream_addon)
             return False
@@ -120,7 +120,7 @@ def _has_inputstream(self):
 
     def _inputstream_enabled(self):
         """Returns whether selected InputStream add-on is enabled.."""
-        data = jsonrpc(method='Addons.GetAddonDetails', params=dict(addonid=self.inputstream_addon, properties=['enabled']))
+        data = jsonrpc(method='Addons.GetAddonDetails', params={'addonid': self.inputstream_addon, 'properties': ['enabled']})
         if data.get('result', {}).get('addon', {}).get('enabled'):
             log(0, '{addon} {version} is enabled.', addon=self.inputstream_addon, version=self._inputstream_version())
             return True
@@ -130,7 +130,7 @@ def _inputstream_enabled(self):
 
     def _enable_inputstream(self):
         """Enables selected InputStream add-on."""
-        data = jsonrpc(method='Addons.SetAddonEnabled', params=dict(addonid=self.inputstream_addon, enabled=True))
+        data = jsonrpc(method='Addons.SetAddonEnabled', params={'addonid': self.inputstream_addon, 'enabled': True})
         if 'error' in data:
             return False
         return True
@@ -232,7 +232,7 @@ def install_widevine(self):
     @cleanup_decorator
     def install_widevine_from(self):
         """Install Widevine from a given URL or file."""
-        if yesno_dialog(None, localize(30066)): # download resource with widevine from url? no means specify local
+        if yesno_dialog(None, localize(30066)):  # download resource with widevine from url? no means specify local
             result = dl_extract_widevine(get_setting("image_url"), backup_path())
             if not result:
                 return result
@@ -255,7 +255,6 @@ def install_widevine_from(self):
 
         return False
 
-
     @staticmethod
     def remove_widevine():
         """Removes Widevine CDM"""

lib/inputstreamhelper/kodiutils.py

@@ -231,13 +231,13 @@ def set_setting_bool(key, value):
 
 def get_global_setting(key):
     """Get a Kodi setting"""
-    result = jsonrpc(method='Settings.GetSettingValue', params=dict(setting=key))
+    result = jsonrpc(method='Settings.GetSettingValue', params={'setting': key})
     return result.get('result', {}).get('value')
 
 
 def get_current_window_id():
     """Get current window id"""
-    result = jsonrpc(method='GUI.GetProperties', params=dict(properties=['currentwindow']))
+    result = jsonrpc(method='GUI.GetProperties', params={'properties': ['currentwindow']})
     if result.get('error'):
         return None
     return result.get('result', {}).get('currentwindow').get('id')
@@ -276,13 +276,13 @@ def get_proxies():
 
     proxy_types = ['http', 'socks4', 'socks4a', 'socks5', 'socks5h']
 
-    proxy = dict(
-        scheme=proxy_types[httpproxytype] if 0 <= httpproxytype < 5 else 'http',
-        server=get_global_setting('network.httpproxyserver'),
-        port=get_global_setting('network.httpproxyport'),
-        username=get_global_setting('network.httpproxyusername'),
-        password=get_global_setting('network.httpproxypassword'),
-    )
+    proxy = {
+        'scheme': proxy_types[httpproxytype] if 0 <= httpproxytype < 5 else 'http',
+        'server': get_global_setting('network.httpproxyserver'),
+        'port': get_global_setting('network.httpproxyport'),
+        'username': get_global_setting('network.httpproxyusername'),
+        'password': get_global_setting('network.httpproxypassword'),
+    }
 
     if proxy.get('username') and proxy.get('password') and proxy.get('server') and proxy.get('port'):
         proxy_address = '{scheme}://{username}:{password}@{server}:{port}'.format(**proxy)
@@ -295,7 +295,7 @@ def get_proxies():
     else:
         return None
 
-    return dict(http=proxy_address, https=proxy_address)
+    return {'http': proxy_address, 'https': proxy_address}
 
 
 def log(level=0, message='', **kwargs):

lib/inputstreamhelper/widevine/widevine.py

@@ -180,7 +180,7 @@ def latest_available_widevine_from_repo():
         cdm_url = config.WIDEVINE_DOWNLOAD_URL.format(version=cdm_version, os=cdm_os, arch=cdm_arch)
         http_status = http_head(cdm_url)
         if http_status == 200:
-            available_cdms.append(dict(version=cdm_version, url=cdm_url))
+            available_cdms.append({'version': cdm_version, 'url': cdm_url})
     return available_cdms[-1]
 
 

tests/checkchromeos.py

@@ -7,6 +7,14 @@
 from lib.inputstreamhelper.config import CHROMEOS_RECOVERY_ARM_HWIDS
 
 
+class OutdatedException(Exception):
+    """Is thrown when InputStreamHelper configuration should be updated."""
+
+    def __init__(self, message):
+        self.message = message
+        super(OutdatedException, self).__init__(self.message)
+
+
 def get_devices():
     """Get Chrome OS devices as json object"""
     url = 'https://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices'
@@ -107,7 +115,7 @@ def check_hwids():
         if item not in CHROMEOS_RECOVERY_ARM_HWIDS:
             messages.append('{} is missing, please add it to inputstreamhelper config'.format(item))
     if messages:
-        raise Exception(messages)
+        raise OutdatedException(messages)
 
     smallest = get_smallest()
     hwid = smallest.get('hwidmatch').strip('^.*-').split(' ')[0]

tests/xbmc.py

@@ -195,21 +195,21 @@ def executeJSONRPC(jsonrpccommand):
             ret.append(executeJSONRPC(json.dumps(action)))
         return json.dumps(ret)
 
-    ret = dict(id=command.get('id'), jsonrpc='2.0', result='OK')
+    ret = {'id': command.get('id'), 'jsonrpc': '2.0', 'result': 'OK'}
     if command.get('method').startswith('Input'):
         pass
     elif command.get('method') == 'Player.Open':
         pass
     elif command.get('method') == 'Settings.GetSettingValue':
         key = command.get('params').get('setting')
-        ret.update(result=dict(value=settings.get(key)))
+        ret.update(result={'value': settings.get(key)})
     elif command.get('method') == 'Addons.GetAddonDetails':
         if command.get('params', {}).get('addonid') == 'script.module.inputstreamhelper':
-            ret.update(result=dict(addon=dict(enabled='true', version='0.3.5')))
+            ret.update(result={'addon': {'enabled': 'true', 'version': '0.3.5'}})
         else:
-            ret.update(result=dict(addon=dict(enabled='true', version='1.2.3')))
+            ret.update(result={'addon': {'enabled': 'true', 'version': '1.2.3'}})
     elif command.get('method') == 'Textures.GetTextures':
-        ret.update(result=dict(textures=[dict(cachedurl="", imagehash="", lasthashcheck="", textureid=4837, url="")]))
+        ret.update(result={'textures': [{'cachedurl': '', 'imagehash': '', 'lasthashcheck': '', 'textureid': 4837, 'url': ''}]})
     elif command.get('method') == 'Textures.RemoveTexture':
         pass
     elif command.get('method') == 'JSONRPC.NotifyAll':
@@ -223,7 +223,7 @@ def executeJSONRPC(jsonrpccommand):
                 )
     else:
         log("executeJSONRPC does not implement method '{method}'".format(**command), LOGERROR)
-        return json.dumps(dict(error=dict(code=-1, message='Not implemented'), id=command.get('id'), jsonrpc='2.0'))
+        return json.dumps({'error': {'code': -1, 'message': 'Not implemented'}, 'id': command.get('id'), 'jsonrpc': '2.0'})
     return json.dumps(ret)
 
 
@@ -264,7 +264,7 @@ def log(msg, level=0):
     if level in (4, 5, 6, 7):
         color1 = '\033[31;1m'
         if level in (6, 7):
-            raise Exception(msg)
+            raise ValueError(msg)
     elif level in (2, 3):
         color1 = '\033[33;1m'
     elif level == 0:

tests/xbmcaddon.py

@@ -19,7 +19,7 @@ def __init__(self, id=ADDON_ID):  # pylint: disable=redefined-builtin
 
     def getAddonInfo(self, key):
         """A working implementation for the xbmcaddon Addon class getAddonInfo() method"""
-        stub_info = dict(id=self.id, name=self.id, version='2.3.4', type='kodi.inputstream', profile='special://userdata', path='special://userdata')
+        stub_info = {'id': self.id, 'name': self.id, 'version': '2.3.4', 'type': 'kodi.inputstream', 'profile': 'special://userdata', 'path': 'special://userdata'}
         # Add stub_info values to ADDON_INFO when missing (e.g. path and profile)
         addon_info = dict(stub_info, **ADDON_INFO)
         return addon_info.get(self.id, stub_info).get(key)

tests/xbmcextra.py

@@ -40,11 +40,11 @@ def uri_to_path(uri):
 
 def read_addon_xml(path):
     """Parse the addon.xml and return an info dictionary"""
-    info = dict(
-        path='./',  # '/storage/.kodi/addons/plugin.video.vrt.nu',
-        profile='special://userdata',  # 'special://profile/addon_data/plugin.video.vrt.nu/',
-        type='xbmc.python.pluginsource',
-    )
+    info = {
+        'path': './',  # '/storage/.kodi/addons/plugin.video.vrt.nu',
+        'profile': 'special://userdata',  # 'special://profile/addon_data/plugin.video.vrt.nu/',
+        'type': 'xbmc.python.pluginsource',
+    }
 
     tree = ET.parse(path)
     root = tree.getroot()