From 4a45b8a45e335ed1bc65e8817432d2dd84f36455 Mon Sep 17 00:00:00 2001 From: Etoh Date: Wed, 6 Apr 2022 18:29:32 +0100 Subject: [PATCH 1/5] Add media player version to issue template --- .github/ISSUE_TEMPLATE/bug_report.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index fdd6d0a..0f06d71 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,8 +24,9 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Version and platform:** - - OS: [e.g. Windows 10 or macOS 10.15] + - OS: [e.g. Windows 10 64-bit or macOS 10.15] - Syncplay version and build type: [e.g. Syncplay 1.6.9 portable] + - Media player and version: [e.g.VLC 3.0.16 32-bit] **Additional context** From 1fe36437a2726f111ba9bec0e409dd515ad689f6 Mon Sep 17 00:00:00 2001 From: Etoh Date: Wed, 6 Apr 2022 18:38:20 +0100 Subject: [PATCH 2/5] Missing space --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0f06d71..e9ef2fb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ If applicable, add screenshots to help explain your problem. **Version and platform:** - OS: [e.g. Windows 10 64-bit or macOS 10.15] - Syncplay version and build type: [e.g. Syncplay 1.6.9 portable] - - Media player and version: [e.g.VLC 3.0.16 32-bit] + - Media player and version: [e.g. VLC 3.0.16 32-bit] **Additional context** From 9757e618080127f8b0ae4673f9c32dbc20ada764 Mon Sep 17 00:00:00 2001 From: danfai Date: Wed, 6 Apr 2022 20:02:23 +0200 Subject: [PATCH 3/5] Fixes converting lines to array (#515) if condition was false convertMultilineStringToList returned "" instead of an empty list. --- syncplay/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncplay/utils.py b/syncplay/utils.py index 77c4f46..034a625 100755 --- a/syncplay/utils.py +++ b/syncplay/utils.py @@ -383,7 +383,7 @@ def getListAsMultilineString(pathArray): def convertMultilineStringToList(multilineString): - return str.split(multilineString, "\n") if multilineString else "" + return str.split(multilineString, "\n") if multilineString else [] def playlistIsValid(files): From 74fc46c1d2d208d3c5bd2db6c386c7a8a86742b5 Mon Sep 17 00:00:00 2001 From: Etoh Date: Wed, 6 Apr 2022 19:24:46 +0100 Subject: [PATCH 4/5] Pin setuptools ver on mac to fix package discovery --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d4c638..f73f323 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: - name: Install Python dependencies run: | - pip3 install -U setuptools wheel pip + pip3 install -U setuptools==60.*.* wheel pip pip3 install twisted[tls] appnope requests certifi pip3 install shiboken2==5.15.2 pyside2==5.15.2 pip3 install altgraph modulegraph macholib From 7a1752fc592e361b124b77ee6bf3586b75048885 Mon Sep 17 00:00:00 2001 From: Etoh Date: Wed, 6 Apr 2022 19:28:20 +0100 Subject: [PATCH 5/5] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f73f323..f5ee818 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: - name: Install Python dependencies run: | - pip3 install -U setuptools==60.*.* wheel pip + pip3 install -U setuptools==60.* wheel pip pip3 install twisted[tls] appnope requests certifi pip3 install shiboken2==5.15.2 pyside2==5.15.2 pip3 install altgraph modulegraph macholib