From f249051e83cd5556293de717cedab979988d9c2f Mon Sep 17 00:00:00 2001 From: Etoh Date: Sun, 19 Mar 2023 22:13:26 +0000 Subject: [PATCH] Fix update check on macOS (#595) * buildPy2app: add charset_normalizer to includes * Actions macOS: force universal wheels for charset-normalizer * buildPy2app: add charset_normalizer.md__mypyc to includes --------- Co-authored-by: Alberto Sottile --- .github/workflows/build.yml | 4 ++++ buildPy2app.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96cb909..122c184 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,6 +104,10 @@ jobs: pip3 download --platform macosx_10_10_universal2 --only-binary :all: --no-deps --dest . cryptography pip3 install --no-cache-dir --no-index --find-links . cryptography + pip3 uninstall charset-normalizer -y + pip3 download --platform macosx_10_9_universal2 --only-binary :all: --no-deps --dest . charset-normalizer + pip3 install --no-cache-dir --no-index --find-links . charset-normalizer + - name: Check Python dependencies run: | python3 -c "from PySide6 import __version__; print(__version__)" diff --git a/buildPy2app.py b/buildPy2app.py index 462036d..0cdbfef 100755 --- a/buildPy2app.py +++ b/buildPy2app.py @@ -17,7 +17,7 @@ DATA_FILES = [ OPTIONS = { 'iconfile': 'syncplay/resources/icon.icns', 'extra_scripts': 'syncplayServer.py', - 'includes': {'PySide2.QtCore', 'PySide2.QtUiTools', 'PySide2.QtGui', 'PySide2.QtWidgets', 'certifi', 'cffi', 'pem'}, + 'includes': {'PySide2.QtCore', 'PySide2.QtUiTools', 'PySide2.QtGui', 'PySide2.QtWidgets', 'certifi', 'cffi', 'pem', 'charset_normalizer.md__mypyc'}, 'excludes': {'PySide', 'PySide.QtCore', 'PySide.QtUiTools', 'PySide.QtGui', 'tkinter'}, 'qt_plugins': [ 'platforms/libqcocoa.dylib',