From 08c73999061e16cebc369f55f495e78f6a78bf15 Mon Sep 17 00:00:00 2001 From: hahnec Date: Thu, 14 May 2020 17:43:05 +0200 Subject: [PATCH] refactor(osx): use tk/tcl8.6 libs from brew when bundling --- .travis.yml | 1 + plenopticam/scripts/bundling/pyinst2app.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a43bd31..54af8c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ jobs: osx_image: xcode11.4 language: shell # 'language: python' is an error on Travis CI macOS before_install: + - brew install tcl-tk - python3 --version - python3 -c "exec(\"import tkinter\\nprint(tkinter.TkVersion)\")" - name: "Windows" diff --git a/plenopticam/scripts/bundling/pyinst2app.sh b/plenopticam/scripts/bundling/pyinst2app.sh index ef4746a..0e5d60d 100755 --- a/plenopticam/scripts/bundling/pyinst2app.sh +++ b/plenopticam/scripts/bundling/pyinst2app.sh @@ -14,8 +14,8 @@ pyinstaller plenopticam/gui/top_level.py \ --add-data=./docs/build/html/:./docs/build/html/ \ --exclude-module=matplotlib \ --osx-bundle-identifier='org.pythonmac.unspecified.plenopticam' \ - --add-binary='/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/lib/libtk8.6.dylib':'tk' \ - --add-binary='/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/lib/libtcl8.6.dylib':'tcl' \ + --add-binary='/usr/local/Cellar/tcl-tk/libtk8.6.dylib':'tk' \ + --add-binary='/usr/local/Cellar/tcl-tk/libtcl8.6.dylib':'tcl' \ --hidden-import pkg_resources.py2_warn \ --add-data=plenopticam/cfg/cfg.json:cfg # --add-data=/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/imageio/:./imageio \