Changeset 9f32c57 in sasview

Timestamp:

Sep 10, 2014 5:37:17 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:

820df88

Parents:

833ccf9

Message:

require bumps>0.7.5, which is now pure python

File:

• setup.py (modified) (1 diff)

setup.py

@@ -346 +346 @@
 packages.append("sans.sansview")
 
-#required = ['lxml>=2.2.2', 'numpy>=1.4.1', 'matplotlib>=0.99.1.1', 
-#            'wxPython>=2.8.11', 'pil',
-#            'periodictable>=1.3.0', 'scipy>=0.7.2']
-required = ['lxml', 'periodictable>=1.3.1', 'pyparsing<2.0.0'] #, 'bumps', 'numdifftools']
+required = [
+    'bumps>=0.7.5', '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
+    ## The numbers should be bumped up for matplotlib and wxPython as well.
+    # 'numpy>=1.4.1', 'scipy>=0.7.2', 'matplotlib>=0.99.1.1',
+    # 'wxPython>=2.8.11', 'pil',
+    ]
 
 if os.name=='nt':