Changeset 135638b in sasview

Timestamp:

Feb 4, 2019 2:49:34 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

315caa2, 02644cb

Parents:

99ed727

Message:

fixes to explicit osx yml

File:

• build_tools/conda_qt5_osx.yml (modified) (3 diffs)

build_tools/conda_qt5_osx.yml

@@ -1 @@
-name: qt5_osx_beta
+name: qt5_osx
 channels:
   - conda-forge
@@ -28 +28 @@
   - jupyter_core=4.4.0=py36_intel_1
   - matplotlib=2.2.2=np114py36_intel_1
-  - numpy=1.14.3=py36_intel_0
   - pyparsing=2.2.0=py36_intel_0
   - pysocks=1.6.7=py36_intel_0
@@ -56 +55 @@
   - pyasn1=0.4.2=py_0
   - pyasn1-modules=0.2.1=py_0
+  - numpy=1.14.3=py36_intel_0
   - pip:
     - backports.shutil-get-terminal-size==1.0.0
     - bumps==0.7.8
+    - periodictable==1.5.0
     - html5lib==1.0.1
     - httplib2==0.11.3