Skip to content

Commit

Permalink
Merge pull request #1913 from SasView/console_GH_fix
Browse files Browse the repository at this point in the history
python console fix
  • Loading branch information
Wojciech Potrzebowski authored Sep 13, 2021
2 parents 9158746 + e2a1679 commit 34af25b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
13 changes: 9 additions & 4 deletions installers/sasview.spec
Original file line number Diff line number Diff line change
@@ -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'),
Expand All @@ -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):
Expand Down Expand Up @@ -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=[],
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 34af25b

Please sign in to comment.