Changeset 00fd278 in sasview

Timestamp:

Jan 30, 2019 2:01:44 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

b53f529

Parents:

593b536d

Message:

ipkernel switched to 4.9 to fix console

Location:

build_tools

Files:

• conda_qt5_min_osx.yml (modified) (1 diff)
• conda_qt5_min_ubuntu.yml (modified) (1 diff)
• conda_qt5_osx.yml (modified) (2 diffs)

build_tools/conda_qt5_min_osx.yml

@@ -4 +4 @@
 dependencies:
  - matplotlib=2
+ - numpy=1.15
  - scipy
  - hdf5
  - h5py
  - ipython=6
+ - 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