Changeset 0571738 in sasview


Ignore:
Timestamp:
Sep 25, 2014 1:12:10 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:
72cdbec
Parents:
24a6d2f
Message:

try forcing windows build to download bumps, etc

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build_tools/jenkins_win32_build.bat

    rb2de19d r0571738  
    1616RD /S /Q build 
    1717 
     18%PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.1 
     19%PYTHON% -m pip install -t ../sansview-install --no-deps numdifftools=0.6.0 
     20%PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0 
     21%PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5 
     22 
    1823%PYTHON% setup.py build -cmingw32 
    1924%PYTHON% setup.py bdist_egg --skip-build 
  • sansview/setup_exe.py

    r2d86a877 r0571738  
    2222from distutils.util import get_platform 
    2323root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
     24sys.path.insert(0, os.path.abspath(os.path.join(root, '..', 'sasview-install'))) 
    2425platform = '%s-%s'%(get_platform(),sys.version[:3]) 
    2526build_path = os.path.join(root, 'build','lib.'+platform) 
     
    306307# packages 
    307308# 
    308 packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com', 'ho.pisa'] 
     309packages = [ 
     310    'matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 
     311    'win32com', 'ho.pisa', 'bumps', 'numdifftools', 
     312    ] 
    309313packages.extend([ 
    310 'reportlab', 
    311 'reportlab.graphics.charts', 
    312 'reportlab.graphics.samples', 
    313 'reportlab.graphics.widgets', 
    314 'reportlab.graphics.barcode', 
    315 'reportlab.graphics', 
    316 'reportlab.lib', 
    317 'reportlab.pdfbase', 
    318 'reportlab.pdfgen', 
    319 'reportlab.platypus', 
    320 ]) 
     314    'reportlab', 
     315    'reportlab.graphics.charts', 
     316    'reportlab.graphics.samples', 
     317    'reportlab.graphics.widgets', 
     318    'reportlab.graphics.barcode', 
     319    'reportlab.graphics', 
     320    'reportlab.lib', 
     321    'reportlab.pdfbase', 
     322    'reportlab.pdfgen', 
     323    'reportlab.platypus', 
     324    ]) 
    321325#packages.append('IPython') 
    322326includes = ['site'] 
Note: See TracChangeset for help on using the changeset viewer.