Changeset cb5fb4a in sasview for setup.py


Ignore:
Timestamp:
Nov 22, 2011 5:34:33 PM (8 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:
82905ee
Parents:
641166b
Message:

Re #5 Fixing setup for build server

File:
1 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    rd113531 rcb5fb4a  
    99try: 
    1010    from numpy.distutils.misc_util import get_numpy_include_dirs 
     11    NUMPY_INC = get_numpy_include_dirs()[0] 
    1112except: 
    12     print "\nNumpy is needed to build SansView. Try easy_install numpy.\n" 
    13     sys.exit(0) 
     13    try: 
     14        import numpy 
     15        NUMPY_INC = os.path.join(os.path.split(numpy.__file__),"core","include") 
     16    except: 
     17        print "\nNumpy is needed to build SansView. Try easy_install numpy.\n" 
     18        sys.exit(0) 
    1419 
    1520package_dir = {} 
     
    4752     
    4853# sans.pr 
    49 numpy_incl_path = os.path.join(get_numpy_include_dirs()[0], "numpy") 
     54numpy_incl_path = os.path.join(NUMPY_INC, "numpy") 
    5055srcdir  = os.path.join("pr_inversion", "src", "sans", "pr", "c_extensions") 
    5156 
     
    186191 
    187192required = ['lxml>=2.2.2', 'numpy>=1.4.1', 'matplotlib>=0.99.1.1', 'wxPython>=2.8.11', 
    188             'pil','periodictable>=1.3.0'] 
     193            'pil','periodictable>=1.3.0', 'scipy>=0.7.2'] 
    189194if sys.platform=='win32': 
    190195    required.extend(['comtypes','pywin32', 'pisa', 'html5lib', 'reportlab']) 
Note: See TracChangeset for help on using the changeset viewer.