Merge remote-tracking branch 'refs/remotes/origin/master' into releas…

…e_0.4.2
jnsebgosselin · Sep 13, 2020 · 79a9455 · 79a9455
2 parents cbde6b9 + c4da299
commit 79a9455
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,8 +12,8 @@ environment:
     GWHAT_VERSION: "gwhat_0.4.2"
 
   matrix:
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6"
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
 
 platform:
@@ -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%

diff --git a/releases/gwhat.spec b/releases/gwhat.spec
@@ -11,12 +11,11 @@ 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'],
              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=[],

diff --git 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