Changeset de126d3 in sasview


Ignore:
Timestamp:
Sep 9, 2014 2:11:35 PM (10 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
833ccf9
Parents:
8b74155d
Message:

Fix dependencies for RHEL6

File:
1 edited

Legend:

Unmodified
Added
Removed

  • setup.py

    r8b74155d rde126d3  
    303303    smearer_sources.append(os.path.join(igordir, "winFuncs.c")) 
    304304    geni_sources.append(os.path.join(igordir, "winFuncs.c")) 
    305 ext_modules.extend( [ Extension("sans.models.sans_extension.c_models", 
     305no_ext = [] 
     306#ext_modules.extend( [ Extension("sans.models.sans_extension.c_models", 
     307no_ext.extend( [ Extension("sans.models.sans_extension.c_models", 
    306308                                sources=model_sources,                  
    307309                                include_dirs=[igordir, includedir,  
    … …  
    347349#            'wxPython>=2.8.11', 'pil', 
    348350#            'periodictable>=1.3.0', 'scipy>=0.7.2'] 
    349 required = ['lxml', 'periodictable>=1.3.1', 'pyparsing<2.0.0' 
    350         'bumps', 'numdifftools'] 
     351required = ['lxml', 'periodictable>=1.3.1', 'pyparsing<2.0.0', 'bumps'] #, 'numdifftools'] 
    351352 
    352353if os.name=='nt': 
Note: See TracChangeset for help on using the changeset viewer.