Changeset b24bf4e in sasview

Timestamp:

Oct 24, 2008 11:42:10 AM (16 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:

d171299

Parents:

e43c012

Message:

Notify user when multi-entry data files are loaded

Location:

prview

Files:

• config_removed.py (deleted)
• release_notes.txt (modified) (3 diffs)
• setup_exe.py (modified) (5 diffs)

prview/release_notes.txt

@@ -6 +6 @@
 Package name: prview
 
-1- Version 0.2.x
-        - Release date: ?
-        - Added functionality for .ABS IGOR reduced 1D files.
+1- Version 0.2.3
+        - Release date: 10/24/2008
+        - Protected against loading files with multiple data entries (like cansas XML).
+        - Added functionality to load various data formats.
         - Fixed problem with loading additional data after the P(r) graph's scale has been changed.
         - Fixed problem of silent failure upon loading a file with a point at Q=0.
-        - Added use of SANS DataLoader
-   
-   Version 0.2.3
-    - Release date: 7/9/2008
+        - Added use of SANS DataLoader   
     - Mac compatibility 
     
@@ -43 +41 @@
 
         2.2- Installing:
-                - Get the code from svn://danse.us/sans/releases/prview-0.2.2
+                - Get the code from svn://danse.us/sans/releases/prview-0.2.3
                 - This application is also dependent on the following DANSE code:
-                        svn://danse.us/sans/releases/guitools-0.2.3
-                        svn://danse.us/sans/treleases/guicomm-0.1.0
-                        svn://danse.us/sans/releases/guiframe-0.1.2
+                        svn://danse.us/common/releases/plottools-0.1.1-dev
+                        svn://danse.us/common/releases/util-0.1
+                        svn://danse.us/sans/releases/DataLoader-0.2.1
+                        svn://danse.us/sans/releases/guicomm-0.1.0
+                        svn://danse.us/sans/releases/guiframe-0.1.3-dev
                         svn://danse.us/sans/releases/pr_inversion-0.2.1
                 - The following modules are required:
@@ -54 +54 @@
                         * scipy
                         * wxpython
+                        * PyXML (for cansas reader)
 
 3- Known Issues

prview/setup_exe.py

@@ -2 +2 @@
 
 #
-# The setup to create a single exe file.
+# The setup to create a Windows executable.
+# Inno Setup can then be used with the installer.iss file 
+# in the top source directory to create an installer. 
 #
+# Setuptools clashes with py2exe 0.6.8 (and probably later too).
+# For that reason, most of the code needs to have direct imports
+# that are not going through pkg_resources. 
+#
+# Attention should be paid to dynamic imports. Data files can
+# be added to the distribution directory for that purpose.
+# See for example the 'images' directory below.
 
 import os, sys
-
 from distutils.core import setup
-
 from distutils.filelist import findall
-
 import matplotlib
-
 import py2exe
 
@@ -46 +51 @@
         self.__dict__.update(kw)
         # for the versioninfo resources
-        self.version = "0.1"
+        self.version = "0.2"
         self.company_name = "U Tennessee"
         self.copyright = "copyright 2008"
@@ -57 +62 @@
 matplotlibdatadir = matplotlib.get_data_path()
 matplotlibdata = findall(matplotlibdatadir)
-matplotlibdata_files = []
+data_files = []
 
 for f in matplotlibdata:
-    dirname = os.path.join('matplotlibdata', f[len(matplotlibdatadir)+1:])
-    matplotlibdata_files.append((os.path.split(dirname)[0], [f]))
+    dirname = os.path.join('mpl-data', f[len(matplotlibdatadir)+1:])
+    data_files.append((os.path.split(dirname)[0], [f]))
 
+# Copying the images directory to the distribution directory.
+for f in findall('images'):
+    if os.path.split(f)[0].count('.svn')==0:
+        data_files.append((os.path.split(f)[0], [f]))
+    
 #
 # packages
 #
-packages = [
-    'matplotlib', 'pytz'
-    ]
-
+packages = ['matplotlib', 'pytz']
 includes = []
-excludes = ['OpenGL'] 
+excludes = [] 
 
 dll_excludes = [
@@ -79 +86 @@
     ]
 
-## This is the client for PARK: run on wx
 target_wx_client = Target(
     description = 'P(r) inversion viewer',
     script = 'sansview.py',
-    #other_resources = [(RT_MANIFEST, 1, manifest_template % dict(prog="AppJob"))],
     icon_resources = [(1, "images/ball.ico")],
     other_resources = [(24,1,manifest)],
@@ -106 +111 @@
             },
     },
-    data_files=matplotlibdata_files
+    data_files=data_files
     
-    # Do something like this to add images to the distribution
-    #data_files=[ ("prog",["kategorien.xml",])]
 )