Changeset 30ad350 in sasview

Timestamp:

Dec 22, 2011 2:32:13 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

e615a0d

Parents:

22b1d38

Message:

put back pil for linux

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -7 +7 @@
 
 import sys
-
 import os
 import platform
@@ -305 +304 @@
 #            'periodictable>=1.3.0', 'scipy>=0.7.2']
 required = ['lxml','periodictable>=1.3.0']
-"""
+
 if os.name=='nt':
     #required.extend(['comtypes', 'pisa', 'html5lib', 'reportlab'])
@@ -313 +312 @@
 else:
     required.extend(['pil'])
-"""   
+   
  # Set up SansView    
 setup(