Changeset 24a6d2f in sasview

Timestamp:

Sep 25, 2014 12:49:35 AM (10 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0571738

Parents:

2d86a877

Message:

require bumps 0.7.5.1

Files:

• build_tools/jenkins_linux_build.sh (modified) (1 diff)
• build_tools/jenkins_rhel6_build.sh (modified) (1 diff)
• check_packages.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

build_tools/jenkins_linux_build.sh

@@ -15 +15 @@
 rm -rf build
 
-"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5
+"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.1
 "$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0
 

build_tools/jenkins_rhel6_build.sh

@@ -28 +28 @@
 "$EASY_INSTALL" -d "$WORKSPACE/utils" lxml
 "$EASY_INSTALL" -d "$WORKSPACE/utils" pyparsing==1.5.5
-"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5
+"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.1
 "$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0
 python deps.py

check_packages.py

@@ -14 +14 @@
     'pylint':{'version':None,'import_name':'pylint','test':None},
     'periodictable':{'version':'1.3.0','import_name':'periodictable','test':'__version__'},
-    'bumps':{'version':'0.7.5','import_name':'bumps','test':'__version__'},
+    'bumps':{'version':'0.7.5.1','import_name':'bumps','test':'__version__'},
     'numpy':{'version':'1.6.1','import_name':'numpy','test':'__version__'},
     'scipy':{'version':'0.10.1','import_name':'scipy','test':'__version__'},
@@ -20 +20 @@
     'matplotlib':{'version':'1.1.0','import_name':'matplotlib','test':'__version__'},
     'pisa':{'version':'3.0.28','import_name':'ho.pisa','test':'__version__'},
+    'numdifftools':{'version':'0.6.0','import_name':'numdifftools','test':None},
 }
 win_required_package_list = {

setup.py

@@ -348 +348 @@
 
 required = [
-    'bumps>=0.7.5', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 
+    'bumps>=0.7.5.1', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
 
     # 'lxml>=2.2.2',