[Scipy-svn] r6525 - in trunk/scipy/io: . examples

[scipy-svn at scipy.org]

Author: rgommers
Date: 2010-06-18 08:03:03 -0500 (Fri, 18 Jun 2010)
New Revision: 6525

Removed:
   trunk/scipy/io/examples/read_array_demo1.py
   trunk/scipy/io/examples/test.txt
Modified:
   trunk/scipy/io/setup.py
   trunk/scipy/io/setupscons.py
Log:
Remove example using removed functions from scipy.io.

Deleted: trunk/scipy/io/examples/read_array_demo1.py
===================================================================
--- trunk/scipy/io/examples/read_array_demo1.py	2010-06-18 13:02:34 UTC (rev 6524)
+++ trunk/scipy/io/examples/read_array_demo1.py	2010-06-18 13:03:03 UTC (rev 6525)
@@ -1,58 +0,0 @@
-#=========================================================================
-# NAME: read_array_demo1
-#
-# DESCRIPTION: Examples to read 2 columns from a multicolumn ascii text
-# file, skipping the first line of header. First example reads into
-# 2 separate arrays. Second example reads into a single array. Data are
-# then plotted.
-#
-# Here is the format of the file test.txt:
-# --------
-# Some header to skip
-# 1 2 3
-# 2 4 6
-# 3 6 9
-# 4 8 12
-#
-# USAGE:
-# python read_array_demo1.py
-#
-# PARAMETERS:
-#
-# DEPENDENCIES:
-# matplotlib (pylab)
-# test.txt
-#
-#
-# AUTHOR: Simon J. Hook
-# DATE  : 09/23/2005
-#
-# MODIFICATION HISTORY:
-#
-# COMMENT:
-#
-#============================================================================
-
-from scipy import *
-from scipy.io import read_array
-from pylab import *
-
-def main():
-
-    # First example, read first and second column from ascii file. Skip first
-    # line of header.
-    # Note use of (1,-1) in lines to skip first line and then read to end of file
-    # Note use of (0,) in columns to pick first column, since its a tuple need trailing comma
-    x=read_array("test.txt",lines=(1,-1), columns=(0,))
-    y=read_array("test.txt",lines=(1,-1), columns=(1,))
-
-    #Second example, read the file into a single arry
-    z=read_array("test.txt",lines=(1,-1), columns=(0,2))
-
-    # Plot the data
-    plot(x,y,'r--',z[:,0],z[:,1])
-    show()
-
-# The one and only main function
-if __name__ == "__main__":
-    main()

Deleted: trunk/scipy/io/examples/test.txt
===================================================================
--- trunk/scipy/io/examples/test.txt	2010-06-18 13:02:34 UTC (rev 6524)
+++ trunk/scipy/io/examples/test.txt	2010-06-18 13:03:03 UTC (rev 6525)
@@ -1,5 +0,0 @@
-some header to skip
-1 2 3 
-2 4 6
-3 6 9
-4 8 12
\ No newline at end of file

Modified: trunk/scipy/io/setup.py
===================================================================
--- trunk/scipy/io/setup.py	2010-06-18 13:02:34 UTC (rev 6524)
+++ trunk/scipy/io/setup.py	2010-06-18 13:03:03 UTC (rev 6525)
@@ -5,7 +5,6 @@
     config = Configuration('io', parent_package, top_path)
 
     config.add_data_dir('tests')
-    config.add_data_dir('examples')
     config.add_data_dir('docs')
     config.add_subpackage('matlab')
     config.add_subpackage('arff')

Modified: trunk/scipy/io/setupscons.py
===================================================================
--- trunk/scipy/io/setupscons.py	2010-06-18 13:02:34 UTC (rev 6524)
+++ trunk/scipy/io/setupscons.py	2010-06-18 13:03:03 UTC (rev 6525)
@@ -7,7 +7,6 @@
     config.add_sconscript('SConstruct')
 
     config.add_data_dir('tests')
-    config.add_data_dir('examples')
     config.add_data_dir('docs')
     config.add_subpackage('matlab')
     config.add_subpackage('arff')