Changeset e9b115aa in sasview

Timestamp:

Jan 31, 2019 5:45:43 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

a22b77a

Parents:

fa9ebe8

Message:

Further changes/fixes to the Ubuntu yaml file

File:

• build_tools/conda_qt5_ubuntu.yml (modified) (5 diffs)

build_tools/conda_qt5_ubuntu.yml

@@ -23 +23 @@
   - cryptography=2.2.1=py36_0
   - cycler=0.10.0=py36_0
-  - dbus=1.11.0=0
+  - dbus
   - decorator=4.3.0=py_0
   - docutils=0.14=py36_0
@@ -30 +30 @@
   - freetype=2.8.1=0
   - gettext=0.19.8.1=0
-  - glib=2.55.0=0
-  - gst-plugins-base=1.8.0=0
-  - gstreamer=1.8.0=1
+  - glib=2
+  - gst-plugins-base
+  - gstreamer
   - h5py=2.8.0=py36h470a237_0
   - hdf5=1.10.1=2
@@ -51 +51 @@
   - mako=1.0.7=py36_0
   - markupsafe=1.0=py36_0
-  - matplotlib=2.2.2=py36_1
+  - matplotlib=2
   - ncurses=5.9=10
   - ocl-icd=2.2.9=4
   - openblas=0.2.20=7
-  - openssl=1.0.2o=0
+  - openssl
   - packaging=17.1=py_0
   - pcre=8.41=1
@@ -66 +66 @@
   - pyopenssl=18.0.0=py36_0
   - pyparsing=2.2.0=py36_0
-  - pyqt=5.6.0=py36_5
+  - pyqt>=5.9.0
   - pysocks=1.6.8=py36_1
-  - python=3.6.5=1
+  - python=3.6
   - python-dateutil=2.7.3=py_0
   - pytools=2018.4=py_0
   - pytz=2018.4=py_0
-  - qt=5.6.2=7
+  - qt>=5.9
   - readline=7.0=0
   - requests=2.18.4=py36_1
   - setuptools=39.2.0=py36_0
-  - sip=4.18=py36_1
-  - six=1.11.0=py36_1
+  - sip
+  - six>=1.11.0=py36_1
   - snowballstemmer=1.2.1=py36_0
   - sphinx=1.7.4=py36_0
   - sphinxcontrib-websupport=1.0.1=py36_0
-  - sqlite=3.20.1=2
+  - sqlite
   - tk=8.6.7=0
   - tornado=5.0.2=py36_0
@@ -103 +103 @@
   - scipy=1.1.0=py36hfc37229_0
   - service_identity=17.0.0=py36_0
+  - jedi=0.12.1
   - pip:
     - automat==0.6.0