From e4d0937782e2b2343706789d14e19d093f62ba25 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 4 Dec 2021 09:58:17 -0500 Subject: [PATCH 1/5] Install required packages for CI to work properly --- requirements-dev.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index c3726e8..db81a8d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1 +1,15 @@ -pyyaml +setuptools >= 44.1.1 # Old setuptools causes script.module.addon.signals to fail installing +six >= 1.13 +python-dateutil >= 2.8.1 +requests >= 2.22 +futures >= 2.2; python_version < '3.0' + +Kodistubs ~= 18.0; python_version < '3.0' +Kodistubs ~= 19.0; python_version >= '3.6' + +git+https://github.com/romanvm/kodi.six +git+https://github.com/ruuk/script.module.addon.signals + +flake8 >= 3.8 +flake8-import-order >= 0.18 +websocket-client >= 0.57.0 From c01a792e256b5ee443ee9b0c4947eabf1cff34f7 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 4 Dec 2021 10:00:29 -0500 Subject: [PATCH 2/5] put pyyaml back for build script --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index db81a8d..e84cbf4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ +pyyaml setuptools >= 44.1.1 # Old setuptools causes script.module.addon.signals to fail installing six >= 1.13 python-dateutil >= 2.8.1 From 89748156a66dce371add1b5c09ae1c587f9e2d0d Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 4 Dec 2021 10:13:07 -0500 Subject: [PATCH 3/5] Fix lint --- resources/lib/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py index cdc72ee..0ccc328 100644 --- a/resources/lib/widgets.py +++ b/resources/lib/widgets.py @@ -369,7 +369,7 @@ def get_widget_content(handle, params): inprogress_url_params["Filters"] = "IsResumable" inprogress_url_params["IsVirtualUnaired"] = False inprogress_url_params["IncludeItemTypes"] = "Episode" - inprogres_surl_params["Limit"] = 20 + inprogress_url_params["Limit"] = 20 in_progress = True elif widget_type == "movie_recommendations": From c33274709e753479ac4d0be0e173ef877ddfd0a7 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 4 Dec 2021 10:25:24 -0500 Subject: [PATCH 4/5] Add tox file for flake8 config --- tox.ini | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tox.ini diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..7b75ae0 --- /dev/null +++ b/tox.ini @@ -0,0 +1,8 @@ +[flake8] +max-line-length = 9999 +import-order-style = pep8 +exclude = .git,.vscode,libraries,build.py,.github +extend-ignore = + I202 +per-file-ignores = + */__init__.py: F401 From b35adac3189ede90b0eb374134f2c1dad7a58c8d Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 4 Dec 2021 10:47:53 -0500 Subject: [PATCH 5/5] Stop failing on unimportant lines --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 7b75ae0..6858ea0 100644 --- a/tox.ini +++ b/tox.ini @@ -6,3 +6,4 @@ extend-ignore = I202 per-file-ignores = */__init__.py: F401 + scripts/process_addon.py: F821