- Timestamp:
- Aug 11, 2016 8:16:28 AM (8 years ago)
- 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:
- b61bd57, 66f21cd
- Parents:
- e5c09cf (diff), 801a296 (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. - Location:
- sasview
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/__init__.py
r8ca1ba1 r801a296 3 3 try: 4 4 import subprocess 5 git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD']) 5 import os 6 FNULL = open(os.devnull, 'w') 7 git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], 8 stderr=FNULL, 9 shell=True) 6 10 __build__ = str(git_revision).strip() 7 11 except: -
sasview/setup_exe.py
r5552396 rc3e4e213 242 242 if os.path.isfile(f): 243 243 data_files.append(('.', [f])) 244 245 # atlas DLL required by matplotlib 11.1 246 # ** REVISIT WHEN MOVING TO ANACONDA ** 247 f = "c:\\python27\\lib\\site-packages\\numpy\\core\\numpy-atlas.dll" 248 if os.path.isfile(f): 249 data_files.append(('.', [f])) 244 250 245 251 if os.path.isfile("BUILD_NUMBER"): … … 332 338 # numpy 1.8 openmp bindings (still seems to use all the cores without them) 333 339 #'libiomp5md.dll', 'libifcoremd.dll', 'libmmd.dll', 'svml_dispmd.dll','libifportMD.dll', 340 'numpy-atlas.dll', 334 341 # microsoft C runtime (not allowed to ship with the app; need to ship vcredist 335 342 'msvcp90.dll',
Note: See TracChangeset
for help on using the changeset viewer.