Changes in / [e2083f1a:56dd23c] in sasview

Files:

• build_tools/conda_qt5_min_ubuntu.yml (modified) (1 diff)
• build_tools/conda_qt5_ubuntu.yml (modified) (6 diffs)
• build_tools/jenkins_ubuntu_build.sh (modified) (1 diff)
• installers/sasview_qt5_min_centos.spec (modified) (2 diffs)

build_tools/conda_qt5_min_ubuntu.yml

@@ -3 +3 @@
  - conda-forge
 dependencies:
- - matplotlib=2
- - scipy
- - hdf5
- - h5py
- - ipython
+ - matplotlib=2.2.2
+ - scipy=1.1.0
+ - hdf5=1.10.1
+ - h5py=2.8.0
+ - ipython=6
  - ipykernel=4.9
  - jupyter
- - twisted
- - lxml
- - sphinx
- - cython
+ - twisted=18.4.0
+ - lxml=4.2.1
+ - sphinx=1.7.4
+ - cython=0.28.3
  - pytest
- - mako
- - pyinstaller 
+ - 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!!!
 # - pyopencl
 # - pocl
  - pip:
-   - pytools 
-   - periodictable 
-   - bumps 
-   - xhtml2pdf 
-   - qt5reactor 
+   - pytools==2018.4
+   - periodictable==1.5.0
+   - bumps==0.7.8
+   - xhtml2pdf==0.2.2
+   - qt5reactor==0.5

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
@@ -44 +44 @@
   - libpng=1.6.34=0
   - libsodium=1.0.16=0
-  - libtiff=4.0.9=0
+  - libtiff
   - libxcb=1.13=0
   - libxslt=1.1.32=0
@@ -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

build_tools/jenkins_ubuntu_build.sh

@@ -18 +18 @@
 cd build_tools
 conda env create --force -f conda_qt5_min_ubuntu.yml
+# conda env create --force -f conda_qt5_ubuntu.yml
 conda env list
 

installers/sasview_qt5_min_centos.spec

@@ -83 +83 @@
 # else:
 #     raise Exception("No numerical library for numpy found.")
-# 
+
 
 #import sas.sascalc.dataloader.readers
@@ -153 +153 @@
  'site','lxml._elementpath','lxml.etree',
  'scipy._lib.messagestream',
+ 'IPython',
 ]