Changeset 0571738 in sasview

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:

• build_tools/jenkins_win32_build.bat (modified) (1 diff)
• sansview/setup_exe.py (modified) (2 diffs)

build_tools/jenkins_win32_build.bat

@@ -16 +16 @@
 RD /S /Q build
 
+%PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.1
+%PYTHON% -m pip install -t ../sansview-install --no-deps numdifftools=0.6.0
+%PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0
+%PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5
+
 %PYTHON% setup.py build -cmingw32
 %PYTHON% setup.py bdist_egg --skip-build

sansview/setup_exe.py

@@ -22 +22 @@
 from distutils.util import get_platform
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, os.path.abspath(os.path.join(root, '..', 'sasview-install')))
 platform = '%s-%s'%(get_platform(),sys.version[:3])
 build_path = os.path.join(root, 'build','lib.'+platform)
@@ -306 +307 @@
 # packages
 #
-packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com', 'ho.pisa']
+packages = [
+    'matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes',
+    'win32com', 'ho.pisa', 'bumps', 'numdifftools',
+    ]
 packages.extend([
-'reportlab',
-'reportlab.graphics.charts',
-'reportlab.graphics.samples',
-'reportlab.graphics.widgets',
-'reportlab.graphics.barcode',
-'reportlab.graphics',
-'reportlab.lib',
-'reportlab.pdfbase',
-'reportlab.pdfgen',
-'reportlab.platypus',
-])
+    'reportlab',
+    'reportlab.graphics.charts',
+    'reportlab.graphics.samples',
+    'reportlab.graphics.widgets',
+    'reportlab.graphics.barcode',
+    'reportlab.graphics',
+    'reportlab.lib',
+    'reportlab.pdfbase',
+    'reportlab.pdfgen',
+    'reportlab.platypus',
+    ])
 #packages.append('IPython')
 includes = ['site']