Remove support for Python 2 and pre-Matrix versions of Kodi

Author: horstle

.github/workflows/addon-check.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kodi-branch: [krypton, leia, matrix]
+        kodi-branch: [matrix, nexus, omega]
     steps:
     - uses: actions/checkout@v2
       with:
@@ -27,12 +27,5 @@ jobs:
     - name: Remove unwanted files
       run: awk '/export-ignore/ { print $1 }' .gitattributes | xargs rm -rf --
       working-directory: ${{ github.repository }}
-    - name: Rewrite addon.xml for Matrix
-      run: |
-        xmlstarlet ed -L -u '/addon/requires/import[@addon="xbmc.python"]/@version' -v "3.0.0" addon.xml
-        version=$(xmllint --xpath 'string(/addon/@version)' addon.xml)
-        xmlstarlet ed -L -u '/addon/@version' -v "${version}+matrix.99" addon.xml
-      working-directory: ${{ github.repository }}
-      if: matrix.kodi-branch == 'matrix'
     - name: Run kodi-addon-checker
       run: kodi-addon-checker --branch=${{ matrix.kodi-branch }} ${{ github.repository }}/

.github/workflows/ci.yml

@@ -18,13 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        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'
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
     steps:
     - name: Check out ${{ github.sha }} from repository ${{ github.repository }}
       uses: actions/checkout@v2
@@ -47,10 +41,8 @@ jobs:
     - name: Check for untranslated strings
       run: make check-untranslated
       continue-on-error: true
-    # Python 2.7 and Python 3.5 are no longer supported by proxy.py
-    - name: Start proxy server, when supported
+    - name: Start proxy server
       run: python -m proxy --threaded --hostname 127.0.0.1 --log-level DEBUG &
-      if: matrix.python-version != '2.7' && matrix.python-version != '3.5'
     - name: Run unit tests
       run: coverage run -m unittest discover
     - name: Run addon using cli

.github/workflows/release.yml

@@ -14,15 +14,11 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install libxml2-utils
-          make multizip release=1
-      - name: Get Krypton filename
-        id: get-krypton-filename
-        run: |
-          echo ::set-output name=krypton-filename::$(cd ..;ls script.module.inputstreamhelper*.zip | grep -v '+matrix.' | head -1)
+          make zip release=1
       - name: Get Matrix filename
         id: get-matrix-filename
         run: |
-          echo ::set-output name=matrix-filename::$(cd ..;ls script.module.inputstreamhelper*+matrix.*.zip | head -1)
+          echo ::set-output name=matrix-filename::$(cd ..;ls script.module.inputstreamhelper*.zip | head -1)
       - name: Get body
         id: get-body
         run: |
@@ -43,16 +39,6 @@ jobs:
           body: ${{ steps.get-body.outputs.body }}
           draft: false
           prerelease: false
-      - name: Upload Krypton/Leia zip
-        id: upload-krypton-zip 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_name: ${{ steps.get-krypton-filename.outputs.krypton-filename }}
-          asset_path: ../${{ steps.get-krypton-filename.outputs.krypton-filename }}
-          asset_content_type: application/zip
       - name: Upload Matrix zip
         id: upload-matrix-zip 
         uses: actions/upload-release-asset@v1
@@ -65,12 +51,12 @@ jobs:
           asset_content_type: application/zip
       - name: Generate distribution zip and submit to official kodi repository
         id: kodi-addon-submitter
-        uses: mediaminister/action-kodi-addon-submitter@master
+        uses: xbmc/action-kodi-addon-submitter@master
         with:
           kodi-repository: repo-scripts
-          kodi-version: krypton
+          kodi-version: matrix
           addon-id: script.module.inputstreamhelper
-          kodi-matrix: true
+          kodi-matrix: false
         env:
           GH_USERNAME: ${{secrets.GH_USERNAME}}
           GH_TOKEN: ${{secrets.GH_TOKEN}}

.github/workflows/status.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - name: Check out ${{ github.sha }} from repository ${{ github.repository }}
       uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v1
     - name: Install dependencies
       run: |

Makefile

@@ -1,12 +1,12 @@
 export PYTHONPATH := $(CURDIR)/lib/:$(CURDIR)/tests/
 PYTHON := python
-KODI_PYTHON_ABIS := 3.0.0 2.25.0
 
 name = $(shell xmllint --xpath 'string(/addon/@id)' addon.xml)
 version = $(shell xmllint --xpath 'string(/addon/@version)' addon.xml)
 git_branch = $(shell git rev-parse --abbrev-ref HEAD)
 git_hash = $(shell git rev-parse --short HEAD)
-matrix = $(findstring $(shell xmllint --xpath 'string(/addon/requires/import[@addon="xbmc.python"]/@version)' addon.xml), $(word 1,$(KODI_PYTHON_ABIS)))
+
+kodi_branch ?= matrix
 
 ifdef release
 	zip_name = $(name)-$(version).zip
@@ -53,8 +53,7 @@ check-untranslated:
 
 check-addon: clean
 	@echo -e "$(white)=$(blue) Starting sanity addon tests$(reset)"
-	kodi-addon-checker . --branch=krypton
-	kodi-addon-checker . --branch=leia
+	kodi-addon-checker . --branch=$(kodi_branch)
 
 kill-proxy:
 	-pkill -ef '$(PYTHON) -m proxy'
@@ -78,15 +77,6 @@ build: clean
 	cd ..; zip -r $(zip_name) $(include_paths) -x $(exclude_files)
 	@echo -e "$(white)=$(blue) Successfully wrote package as: $(white)../$(zip_name)$(reset)"
 
-multizip: clean
-	@-$(foreach abi,$(KODI_PYTHON_ABIS), \
-		echo "cd /addon/requires/import[@addon='xbmc.python']/@version\nset $(abi)\nsave\nbye" | xmllint --shell addon.xml; \
-		matrix=$(findstring $(abi), $(word 1,$(KODI_PYTHON_ABIS))); \
-		if [ $$matrix ]; then version=$(version)+matrix.1; else version=$(version); fi; \
-		echo "cd /addon/@version\nset $$version\nsave\nbye" | xmllint --shell addon.xml; \
-		make zip; \
-	)
-
 clean:
 	@echo -e "$(white)=$(blue) Cleaning up$(reset)"
 	find . -name '*.py[cod]' -type f -delete

addon.xml

@@ -2,7 +2,7 @@
 <addon id="script.module.inputstreamhelper" name="InputStream Helper" version="0.6.1" provider-name="emilsvennesson, dagwieers, mediaminister, horstle">
   <requires>
     <!--py3 compliant-->
-    <import addon="xbmc.python" version="2.25.0"/>
+    <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.pysocks" version="1.6.8" optional="true"/>
   </requires>
   <!-- This is needed to get an add-on icon -->

requirements.txt

@@ -1,8 +1,7 @@
 coverage
 kodi-addon-checker
 polib
-proxy.py; python_version != '2.7'
+proxy.py
 pylint
 setuptools >= 41
 tox
-xmlschema==1.0.18; python_version == '2.7'

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38,flake8
+envlist = py37,py38,py39,py310,py311,flake8
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -16,7 +16,7 @@ builtins = func
 max-line-length = 160
 ignore = E129,FI13,FI50,FI51,FI53,FI54,W503
 require-code = True
-min-version = 2.7
+min-version = 3.7
 exclude = .tox,experiment
 
 [pytest]