Changeset bb3b1c2 in sasview

Timestamp:

Jul 16, 2018 5:42:32 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

2531767

Parents:

ce1f491

Message:

Fix for the qtconsole not working correctly

File:

• installers/sasview_qt5.spec (modified) (2 diffs)

installers/sasview_qt5.spec

@@ -43 +43 @@
 datas = [('../src/sas/sasview/images', 'images')]
 
-datas = [('../src/sas/sasview/images/ball.png', '.')]
+#datas = [('../src/sas/sasview/images/ball.png', '.')]
 
 datas.append(('../src/sas/sasview/media','media'))
@@ -65 +65 @@
 datas.append((os.path.join('..', 'src','sas','sasgui','perspectives','fitting','plugin_models'),'plugin_models'))
 datas.append((os.path.join(PYTHON_LOC,'Library','plugins','platforms'),'platforms'))
-datas.append((os.path.join(PYTHON_LOC,'Lib','site-packages','zmq','libzmq.cp36-win_amd64.pyd'),'.'))
+datas.append((os.path.join(PYTHON_LOC,'Lib','site-packages','jedi'),'jedi'))
+datas.append((os.path.join(PYTHON_LOC,'Library','bin', 'libzmq.dll'),'libzmq.pyd'))
 
 # These depend on whether we have MKL or Atlas numpy