Changeset 9b9ec10 in sasview for build_tools/conda_qt5_win.yml

Timestamp:

Sep 25, 2018 8:35:34 AM (6 years ago)

Author:

Laura Forster <Awork@…>

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:

fa762f4, 20f4857

Parents:

085409e3 (diff), 65e76ed (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

File:

• build_tools/conda_qt5_win.yml (modified) (1 diff)

build_tools/conda_qt5_win.yml

@@ -4 +4 @@
 dependencies:
  - python=3
- - matplotlib==2.1.0
+ - matplotlib==2
  - scipy
  - hdf5