Changeset b51c8fc in sasview for build_tools

Timestamp:

Aug 21, 2018 4:29:58 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:

28d070a, 4e887d8

Parents:

04ac604 (diff), c972e3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

build_tools

Files:

• conda_qt5_min_ubuntu.yml (modified) (1 diff)
• conda_qt5_win.yml (modified) (1 diff)
• jenkins_ubuntu_build.sh (modified) (2 diffs)

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