Changeset b53f529 in sasview for build_tools

Timestamp:

Jan 30, 2019 12:02:00 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

2c2621b

Parents:

00fd278 (diff), 0930e22 (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_centos.yml (modified) (1 diff)
• conda_qt5_min_osx.yml (modified) (2 diffs)
• conda_qt5_win.yml (modified) (1 diff)
• conda_qt5_min_ubuntu.yml (modified) (1 diff)
• conda_qt5_osx.yml (modified) (2 diffs)

build_tools/conda_qt5_min_centos.yml

@@ -7 +7 @@
  - hdf5
  - h5py
- - ipython
+ - ipython=6
+ - ipykernel=4.9
  - jupyter
  - twisted

build_tools/conda_qt5_min_osx.yml

@@ -20 +20 @@
  - pyopencl
  - testpath=0.3.1
+ - numpy=1.15
  - pip:
    - pytools 
@@ -25 +26 @@
    - bumps 
    - xhtml2pdf 
-   - qt5reactor 
+   - qt5reactor
 

build_tools/conda_qt5_win.yml

@@ -9 +9 @@
  - h5py
  - ipython=6
- - ipykernel=5
+ - ipykernel=4.9
  - jupyter
  - twisted

build_tools/conda_qt5_min_ubuntu.yml

@@ -8 +8 @@
  - h5py
  - ipython
+ - ipykernel=4.9
  - jupyter
  - twisted

build_tools/conda_qt5_osx.yml

@@ -1 @@
-name: qt5_osx
+name: qt5_osx_2
 channels:
   - diffpy
@@ -31 +31 @@
   - libcxx=6.0.0=0
   - libgfortran=3.0.0=0
-  - libtiff=4.0.9=0
   - libxslt=1.1.32=0
   - llvm-meta=6.0.0=0