From d56ca824792010083cbf56e934fcaec7eadcb0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Sun, 13 Sep 2020 13:07:45 -0400 Subject: [PATCH 1/6] Increase pyinstaller version to 3.6 from 3.4 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 84cd87205..e2c8f4392 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ test_script: after_test: # Install requirements for packaging GWHAT. - - python -m pip install pyinstaller==3.4 pywin32 tornado + - python -m pip install pyinstaller==3.6 pywin32 tornado # Package GWHAT with PyInstaller. - cmd: set PYTHONPATH=C:\projects\gwhat;%PYTHONPATH% From a7e94630b3a8dedec0378f60e1dfd5fd207532bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Sun, 13 Sep 2020 13:08:02 -0400 Subject: [PATCH 2/6] Increase python version to 3.7 from 3.6 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e2c8f4392..2a9f98b32 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ environment: matrix: - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6" + PYTHON_VERSION: "3.7" PYTHON_ARCH: "64" platform: From 524dbb32144ad2351438c9fd4a134bce1606216e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Sun, 13 Sep 2020 13:08:19 -0400 Subject: [PATCH 3/6] Add vcruntime140_1.dll to binaries when packaging with pyinstaller --- releases/gwhat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/gwhat.spec b/releases/gwhat.spec index 6d78ed08f..154c38e1c 100644 --- a/releases/gwhat.spec +++ b/releases/gwhat.spec @@ -16,7 +16,7 @@ HIDDENIMPORTS = ['h5py.defs', 'h5py.utils', 'h5py.h5ac', 'h5py._proxy', a = Analysis(['../gwhat/mainwindow.py'], pathex=['C:\\Program Files (x86)\\Windows Kits\\10\\Redist\\ucrt\\DLLs\\x64'], - binaries=[], + binaries=[('C:\\Windows\\System32\\vcruntime140_1.dll', '.')], datas=added_files , hiddenimports=HIDDENIMPORTS, hookspath=[], From ad23cd0f77f0f65179a659521249902528e87b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Sun, 13 Sep 2020 13:12:59 -0400 Subject: [PATCH 4/6] Specify python path correctly in appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2a9f98b32..51462d915 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: GWHAT_VERSION: "gwhat_0.4.2.dev0" matrix: - - PYTHON: "C:\\Python36-x64" + - PYTHON: "C:\\Python37-x64" PYTHON_VERSION: "3.7" PYTHON_ARCH: "64" From 2ccbbf1c882d64b5cdbcc6c035e4eff1ce615c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Sun, 13 Sep 2020 13:23:44 -0400 Subject: [PATCH 5/6] Remove scipy from dependencies --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b80ae5e22..3d2aafde0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ xlrd xlwt cython>=0.25.2 numpy>1.14 -scipy matplotlib == 3.1.* requests h5py>=2.8 From f5277ac79f295fc21e7035243cb9defd09933d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gosselin?= Date: Sun, 13 Sep 2020 13:24:12 -0400 Subject: [PATCH 6/6] Remove scipy related hidden imports in gwhat.spec --- releases/gwhat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/releases/gwhat.spec b/releases/gwhat.spec index 154c38e1c..3b72fed64 100644 --- a/releases/gwhat.spec +++ b/releases/gwhat.spec @@ -11,7 +11,6 @@ added_files = [('../gwhat/ressources/splash.png', 'ressources'), ] HIDDENIMPORTS = ['h5py.defs', 'h5py.utils', 'h5py.h5ac', 'h5py._proxy', - 'scipy.stats._continuous_distns', 'scipy._lib.messagestream', 'numpy.core._dtype_ctypes'] a = Analysis(['../gwhat/mainwindow.py'],