Changeset 5047898 in sasview for build_tools

Timestamp:

Oct 1, 2018 3:10:54 AM (6 years ago)

Author:

wojciech

Branches:

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

Children:

4cbd87f

Parents:

085ee014 (diff), 16417bb (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.

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/01/18 03:10:40)

git-committer:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/01/18 03:10:54)

Message:

Removing tmp file handling from report logic to make it work on OSX

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) (2 diffs)

build_tools/conda_qt5_min_centos.yml

@@ -15 +15 @@
  - pytest
  - mako
- - pyinstaller 
+ - pyinstaller
+ - testpath=0.3.1
 # GPU not set for Centos build system
 # - pyopencl

build_tools/conda_qt5_min_osx.yml

@@ -7 +7 @@
  - hdf5
  - h5py
- - ipython
+ - ipython=6
  - jupyter
  - twisted
@@ -17 +17 @@
  - pyinstaller 
  - pyopencl
+ - testpath=0.3.1
  - pip:
    - pytools 

build_tools/conda_qt5_win.yml

@@ -8 +8 @@
  - hdf5
  - h5py
- - ipython
+ - ipython=6
+ - ipykernel=5
  - jupyter
  - twisted
@@ -18 +19 @@
  - pyinstaller 
  - pyopencl
+ - testpath=0.3.1
  - pip:
    - pytools