Changeset 8b74155d in sasview for setup.py

Timestamp:

Sep 8, 2014 8:26:08 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:

de126d3

Parents:

5b1392f (diff), 1792311 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

bumps integration

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -69 +69 @@
     
     
-enable_openmp = True                    
+enable_openmp = True
 
 if sys.platform =='darwin':
@@ -347 +347 @@
 #            'wxPython>=2.8.11', 'pil',
 #            'periodictable>=1.3.0', 'scipy>=0.7.2']
-required = ['lxml','periodictable>=1.3.1','pyparsing<2.0.0']
+required = ['lxml', 'periodictable>=1.3.1', 'pyparsing<2.0.0'
+        'bumps', 'numdifftools']
 
 if os.name=='nt':