Changeset bda3ce4 in sasview

Timestamp:

Feb 5, 2019 9:36:42 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

d09f462f, a74dd016

Parents:

b9a6546 (diff), 13c552b (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

Files:

• build_tools/conda_qt5_win_commercial.yml (added)
• build_tools/jenkins_qt5_win_commercial.bat (added)
• installers/sasview_qt5_commercial.spec (added)
• build_tools/conda_qt5_min_osx.yml (modified) (1 diff)

build_tools/conda_qt5_min_osx.yml

@@ -3 +3 @@
   - conda-forge
 dependencies:
+ - altgraph=0.15=py_0
+ - appdirs=1.4.3=py_0
+ - attrs=18.1.0=py_0
+ - automat=0.6.0=py36_0
+ - babel=2.6.0=py36_0
+ - backports.functools_lru_cache=1.5=py36_0
+ - ca-certificates=2018.4.16=0
+ - certifi=2018.4.16=py36_0
+ - clangdev=6.0.0=default_0
+ - colorama=0.3.9=py36_0
+ - constantly=15.1.0=py_0
+ - coverage=4.5.1=py36_0
+ - cython=0.28.3=py36_0
+ - h5py=2.8.0=py36h470a237_0
+ - hypothesis=3.57.0=py36h24bf2e0_0
+ - lxml=4.2.1=py36_0
+ - macholib=1.8=py_0
+ - mako=1.0.7=py36_0
+ - openssl=1.0.2o=0
+ - packaging=17.1=py_0
+ - pycrypto=2.6.1=py36_1
+ - pyinstaller=3.3.1=py36_0
+ - pyqt=5.6.0=py36_5
+ - pytools=2018.4=py_0
+ - qt=5.6.2=h9e3eb04_4
+ - qtconsole=4.3.1=py36_0
+ - sphinx=1.7.4=py36_0
+ - sphinxcontrib-websupport=1.0.1=py36_0
+ - tbb=2018_20171205=0
+ - typing=3.6.4=py36_0
+ - service_identity=17.0.0=py36_0
+ - twisted=17.5.0=py36_0
+ - zope=1.0=py36_0
  - matplotlib=2.2.2
  - scipy=1.1.0
  - hdf5=1.10.1
- - h5py=2.8.0
  - ipython=6
  - ipykernel=4.9
  - jupyter
- - twisted=18.4.0
- - lxml=4.2.1
- - sphinx=1.7.4
- - cython=0.28.3
  - pytest
- - mako=1.0.7
- - pyinstaller=3.3.1
- - pyqt>=5.9 # required for GTK themes to work correctly
  - testpath=0.3.1
- - numpy=1.14.3  # NEED TO DOWNGRADE NUMPY!!!
+ - numpy=1.15.1
  - pyopencl=2018.1.1
  - pip:
    - pytools==2018.4
    - periodictable==1.5.0
-   - bumps==0.7.8
+   - bumps==0.7.11
    - xhtml2pdf==0.2.2
    - qt5reactor==0.5