Changeset 8601619 in sasview

Timestamp:

Nov 30, 2011 6:22:08 PM (13 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:

894fb0c

Parents:

7f59928e

Message:

Re #5 fixing compilation on MSVC

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -202 +202 @@
 #required = ['lxml>=2.2.2', 'numpy>=1.4.1', 'matplotlib>=0.99.1.1', 'wxPython>=2.8.11',
 #            'pil','periodictable>=1.3.0', 'scipy>=0.7.2']
-required = ['lxml', 'numpy>=1.3.0', 'matplotlib',
+required = ['lxml', 'numpy>=1.3.0',
             'periodictable>=1.3.0', 'unittest-xml-reporting']
 
@@ -209 +209 @@
     required.extend(['comtypes', 'pisa', 'html5lib'])
 else:
-    required.append('pil')
+    required.append('pil', 'matplotlib')
    
  # Set up SansView