Redo the fix for #178.

artisan-roaster-scope · Apr 22, 2018 · 80693ed · 80693ed
1 parent 3b3d333
commit 80693ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/artisan-linux.spec b/src/artisan-linux.spec
@@ -25,6 +25,14 @@ a = Analysis(['artisan.py'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher)
+
+# Remove pyi_rth_mplconfig.py useless because it makes our startup slow.
+# This hook only applies to one-file distributions.
+for s in a.scripts:
+    if s[0] == 'pyi_rth_mplconfig':
+        a.scripts.remove(s)
+        break
+
 pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,

diff --git a/src/build-linux.sh b/src/build-linux.sh
@@ -31,9 +31,6 @@ else
     ln -s /usr/lib/libusb-1.0.so.0
 fi
 
-# Render pyi_rth_mplconfig.py useless because it makes our startup slow
-echo > $PYTHON_PATH/PyInstaller/loader/rthooks/pyi_rth_mplconfig.py
-
 pyinstaller -D -n artisan -y -c --hidden-import scipy._lib.messagestream \
 	    --log-level=INFO artisan-linux.spec