Skip to content

Commit

Permalink
Remove python 2.7 / Leia support (#113)
Browse files Browse the repository at this point in the history
* Revert changes done for matrix

* Remove python 2.7 / Leia support

* Updates for pylint

* update for pylint

* remove python 3.5 & 3.6 support

* make pylint happy

* make pylint happier

* make pylint super happy
  • Loading branch information
peno64 authored Dec 2, 2023
1 parent 8d65192 commit 382c90d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/addon-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kodi-version: [ leia, matrix ]
kodi-version: [ matrix ]
steps:
- name: Check out ${{ github.sha }} from repository ${{ github.repository }}
uses: actions/checkout@v2
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ]
python-version: [ 3.7, 3.8, 3.9 ]
include:
# Kodi Leia on Windows uses a bundled Python 2.7.
- os: windows-latest
python-version: 2.7

# Kodi Matrix on Windows uses a bundled Python 3.8, but we test 3.9 also to be sure.
- os: windows-latest
python-version: 3.8
Expand Down
3 changes: 3 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ disable=
too-many-branches,
too-many-instance-attributes,
too-many-locals,
consider-using-f-string,
use-dict-literal,
broad-exception-raised,
max-line-length=160
max-statements=70
extension-pkg-whitelist=lxml
13 changes: 8 additions & 5 deletions resources/lib/modules/iptvsimple.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
import os
import time

import glob
import shutil

import xbmcvfs

import dateutil.parser
import dateutil.tz

from resources.lib import kodiutils

import xbmcvfs, glob, shutil

_LOGGER = logging.getLogger(__name__)

IPTV_SIMPLE_ID = 'pvr.iptvsimple'
Expand Down Expand Up @@ -71,9 +74,9 @@ def setup(cls):
path = xbmcvfs.translatePath(addon.getAddonInfo('profile'))
settingsxml = path + 'settings.xml'
if os.path.isfile(settingsxml):
for f in glob.glob(path + "*.xml"):
if os.path.basename(f) != 'settings.xml':
shutil.copyfile(settingsxml, f)
for file in glob.glob(path + "*.xml"):
if os.path.basename(file) != 'settings.xml':
shutil.copyfile(settingsxml, file)

return True

Expand Down

0 comments on commit 382c90d

Please sign in to comment.