Changes in / [04ac604:b51c8fc] in sasview

Files:

• build_tools/conda_qt5_min_ubuntu.yml (modified) (1 diff)
• build_tools/conda_qt5_win.yml (modified) (1 diff)
• build_tools/jenkins_ubuntu_build.sh (modified) (2 diffs)
• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (1 diff)

build_tools/conda_qt5_min_ubuntu.yml

@@ -17 +17 @@
  - pyinstaller 
  - pyqt>=5.9 # required for GTK themes to work correctly
- - pyopencl
+# - pyopencl
+# - pocl
  - pip:
    - pytools 

build_tools/conda_qt5_win.yml

@@ -23 +23 @@
    - xhtml2pdf 
    - qt5reactor 
+   - tinycc
 

build_tools/jenkins_ubuntu_build.sh

@@ -4 +4 @@
 ## Set up path for py36 - conda
 export PATH=/home/sasview/anaconda3/bin:$PATH
-
+export QT_QPA_PLATFORM=offscreen
 
 # Set proxy
@@ -46 +46 @@
 cd sasview
 python src/sas/qtgui/convertUI.py
-python setup.py build docs
-python setup.py install
+python setup.py build docs install
 
 # Pyinstaller

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -1255 +1255 @@
             #if current_tab_name in self.theory_model.item(current_index).text():
             if current_tab_name == self.theory_model.item(current_index).text():
-                return
                 self.theory_model.removeRow(current_index)
                 break