Changeset d9b7197 in sasview for build_tools

Timestamp:

Jul 31, 2018 4:37:59 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

933f9e9

Parents:

f54e82cf (diff), 2fe721be (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 (added)
• conda_qt5_min_osx.yml (modified) (1 diff)

build_tools/conda_qt5_min_osx.yml

@@ -3 +3 @@
   - conda-forge
 dependencies:
- - numpy
  - matplotlib
  - scipy