From 98a0ffb1620c0612ce1ecc599995618e37ceed36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Arnauts?= Date: Sun, 16 Oct 2022 15:36:00 +0200 Subject: [PATCH] Support Python 3.10 (#107) * Support Python 3.10 * Add timeout * Fix test --- .github/workflows/ci.yml | 12 +++++++----- resources/lib/service.py | 2 +- tests/test_api.py | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d0c3ca..28a7943 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,17 +15,19 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest ] - python-version: [ 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 ] + python-version: [ "2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10" ] include: # Kodi Leia on Windows uses a bundled Python 2.7. - os: windows-latest - python-version: 2.7 + python-version: "2.7" - # Kodi Matrix on Windows uses a bundled Python 3.8, but we test 3.9 also to be sure. + # Kodi Matrix on Windows uses a bundled Python 3.8, but we test 3.9 and 3.10 also to be sure. - os: windows-latest - python-version: 3.8 + python-version: "3.8" - os: windows-latest - python-version: 3.9 + python-version: "3.9" + - os: windows-latest + python-version: "3.10" steps: - name: Check out ${{ github.sha }} from repository ${{ github.repository }} uses: actions/checkout@v2 diff --git a/resources/lib/service.py b/resources/lib/service.py index ae8cc5f..bba5fb6 100644 --- a/resources/lib/service.py +++ b/resources/lib/service.py @@ -125,7 +125,7 @@ class KodiPlayer(Player): if not self.av_started: # Check stream path import requests - response = requests.get(self.stream_path) + response = requests.get(self.stream_path, timeout=5) if response.status_code == 403: message_id = 30720 else: diff --git a/tests/test_api.py b/tests/test_api.py index c78cc9f..77edf18 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -75,7 +75,7 @@ class TestApi(unittest.TestCase): @unittest.skipUnless(kodiutils.get_setting('username') and kodiutils.get_setting('password'), 'Skipping since we have no credentials.') def test_get_drm_stream(self): - resolved_stream = self._api.get_stream_by_uuid('b74882b7-7b19-4bfe-9773-22d8ce474aa5') # https://www.goplay.be/video/ncis-los-angeles/ncis-los-angeles-s3/ncis-los-angeles-s3-aflevering-3 + resolved_stream = self._api.get_stream_by_uuid('62e04ab5-1f3c-4385-ad7a-e2943ddb1849') # https://www.goplay.be/video/ncis-los-angeles/ncis-los-angeles-s10/ncis-los-angeles-s10-aflevering-12 self.assertIsInstance(resolved_stream, ResolvedStream)