diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index aa3bd15f45..603ce2c114 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -44,7 +44,10 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5 + python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs + python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint + python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy - name: Install pyopencl (Windows) run: | diff --git a/installers/sasview.spec b/installers/sasview.spec index f4a953ff62..ebd38878d8 100644 --- a/installers/sasview.spec +++ b/installers/sasview.spec @@ -1,9 +1,11 @@ # -*- mode: python ; coding: utf-8 -*- +import sys from pathlib import Path import warnings block_cipher = None +PYTHON_LOC = sys.exec_prefix datas = [ ('../src/sas/sasview/images', 'images'), @@ -16,6 +18,7 @@ datas = [ ('../src/sas/logger_config.py', '.'), ('../src/sas/logging.ini', '.'), ('../../sasmodels/sasmodels','sasmodels'), + (os.path.join(PYTHON_LOC,'Lib','site-packages','debugpy'),'debugpy'), ] def add_data(data): @@ -82,12 +85,13 @@ hiddenimports = [ #'site','lxml._elementpath','lxml.etree', #'scipy._lib.messagestream', #'numba', + 'xmlrpc', + 'xmlrpc.server', + 'debugpy', + 'debugpy._vendored', + 'uncertainties', ] - - - - a = Analysis( ['sasview.py'], pathex=[], @@ -117,6 +121,7 @@ exe = EXE( name='sasview', debug=False, bootloader_ignore_signals=False, + icon=os.path.join("../src/sas/sasview/images","ball.ico"), strip=False, upx=True, console=True