Changeset 38a8c4c in sasview

Timestamp:

Sep 26, 2014 4:37:49 PM (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:

291ef3b

Parents:

a91bc5d

Message:

remove numdifftools requirement (it is now bundled with bumps 0.7.5.2)

Files:

• build_tools/jenkins_linux_build.sh (modified) (1 diff)
• build_tools/jenkins_rhel6_build.sh (modified) (1 diff)
• build_tools/jenkins_win32_build.bat (modified) (1 diff)
• check_packages.py (modified) (2 diffs)
• sansview/setup_exe.py (modified) (1 diff)
• 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.1
+"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.2
 "$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.1
+"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.2
 "$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0
 python deps.py

build_tools/jenkins_win32_build.bat

@@ -16 +16 @@
 RD /S /Q build
 
-rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.1
-rem %PYTHON% -m pip install -t ../sansview-install --no-deps numdifftools=0.6.0
+rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.2
 rem PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0
 rem %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5

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.1','import_name':'bumps','test':'__version__'},
+    'bumps':{'version':'0.7.5.2','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 = {

sansview/setup_exe.py

@@ -308 +308 @@
 packages = [
     'matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes',
-    'win32com', 'ho.pisa', 'bumps', 'numdifftools',
+    'win32com', 'ho.pisa', 'bumps',
     ]
 packages.extend([

setup.py

@@ -348 +348 @@
 
 required = [
-    'bumps>=0.7.5.1', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
+    'bumps>=0.7.5.2', 'periodictable>=1.3.1', 'pyparsing<2.0.0',
 
     # 'lxml>=2.2.2',
     'lxml', 
-
-    ## numdifftools is an optional dependency for bumps, giving better
-    ## errorbars for amoeba and differential evolution.  It is suppressed
-    ## because it forces scipy>=0.8, which the SNS does not yet support.
-    # 'numdifftools',
 
     ## The following dependecies won't install automatically, so assume them