[Numpy-svn] r4117 - in branches/numpy.scons: . numpy numpy/distutils numpy/scons_fake numpy/scons_fake/tests

numpy-svn@scip... numpy-svn@scip...
Mon Sep 24 11:37:34 CDT 2007


Author: cdavid
Date: 2007-09-24 11:37:13 -0500 (Mon, 24 Sep 2007)
New Revision: 4117

Added:
   branches/numpy.scons/numpy/scons_fake/tests/
   branches/numpy.scons/numpy/scons_fake/tests/test_foo_py.py
Modified:
   branches/numpy.scons/
   branches/numpy.scons/numpy/__init__.py
   branches/numpy.scons/numpy/distutils/setup.py
   branches/numpy.scons/numpy/scons_fake/__init__.py
   branches/numpy.scons/numpy/scons_fake/setup.py
Log:
* Add simple test for scons_fake package
* Add distutils/scons in setup.py of distutils



Property changes on: branches/numpy.scons
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-09-25 00:32:47.542000055 +0900
committer: david <david@david-laptop>
properties: 
	branch-nick: numpy.scons

   + timestamp: 2007-09-25 01:35:45.881000042 +0900
committer: david <david@david-laptop>
properties: 
	branch-nick: numpy.scons

Name: bzr:file-ids
   - 
   + numpy/scons_fake/tests	tests-20070924163456-f1o01h1eksm5bevu-1
numpy/scons_fake/tests/test_foo_py.py	test_foo_py.py-20070924163456-f1o01h1eksm5bevu-2

Name: bzr:revision-id:v3-trunk0
   - 3737 david@david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david@david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david@david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david@david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david@ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david@ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david@david-laptop-20070922101656-61kfi2faucemr2rl
3745 david@david-laptop-20070922113708-ror18thshang1cpu
3747 david@david-laptop-20070922140534-n9xsl096tjrzmct1
3749 david@david-laptop-20070922154007-usit009fr6vp377j
3750 david@david-laptop-20070923070011-leu2ozc2fy1q5cht
3751 david@david-laptop-20070924015925-dhsiao40jp7zsfp9
3752 david@ar.media.kyoto-u.ac.jp-20070924070657-nbw23j0ayan30cli
3753 david@ar.media.kyoto-u.ac.jp-20070924082918-i1lc1zikywi8czj4
3754 david@ar.media.kyoto-u.ac.jp-20070924083008-c0edtt8zs31yeh1q
3755 david@ar.media.kyoto-u.ac.jp-20070924112351-pnnho638cohz6lj1
3756 david@david-laptop-20070924153247-yftud00bynilxv69

   + 3737 david@david-laptop-20070920080908-n8pj8vmszdir3zoa
3738 david@david-laptop-20070920081509-58kkojgmml3t7jxs
3739 david@david-laptop-20070920081910-phlk1ujthksgpm0z
3740 david@david-laptop-20070920082641-bdhrt6eafeoli50i
3741 david@ar.media.kyoto-u.ac.jp-20070920130730-satdeppbh1k0bq2p
3743 david@ar.media.kyoto-u.ac.jp-20070921073742-vpv8pwv0j8fbd93m
3744 david@david-laptop-20070922101656-61kfi2faucemr2rl
3745 david@david-laptop-20070922113708-ror18thshang1cpu
3747 david@david-laptop-20070922140534-n9xsl096tjrzmct1
3749 david@david-laptop-20070922154007-usit009fr6vp377j
3750 david@david-laptop-20070923070011-leu2ozc2fy1q5cht
3751 david@david-laptop-20070924015925-dhsiao40jp7zsfp9
3752 david@ar.media.kyoto-u.ac.jp-20070924070657-nbw23j0ayan30cli
3753 david@ar.media.kyoto-u.ac.jp-20070924082918-i1lc1zikywi8czj4
3754 david@ar.media.kyoto-u.ac.jp-20070924083008-c0edtt8zs31yeh1q
3755 david@ar.media.kyoto-u.ac.jp-20070924112351-pnnho638cohz6lj1
3756 david@david-laptop-20070924153247-yftud00bynilxv69
3757 david@david-laptop-20070924163545-pish34x9fq2h66aj


Modified: branches/numpy.scons/numpy/__init__.py
===================================================================
--- branches/numpy.scons/numpy/__init__.py	2007-09-24 15:33:26 UTC (rev 4116)
+++ branches/numpy.scons/numpy/__init__.py	2007-09-24 16:37:13 UTC (rev 4117)
@@ -44,6 +44,7 @@
     import fft
     import random
     import ctypeslib
+    import scons_fake
 
     # Make these accessible from numpy name-space
     #  but not imported in from numpy import *

Modified: branches/numpy.scons/numpy/distutils/setup.py
===================================================================
--- branches/numpy.scons/numpy/distutils/setup.py	2007-09-24 15:33:26 UTC (rev 4116)
+++ branches/numpy.scons/numpy/distutils/setup.py	2007-09-24 16:37:13 UTC (rev 4117)
@@ -4,6 +4,7 @@
     from numpy.distutils.misc_util import Configuration
     config = Configuration('distutils',parent_package,top_path)
     config.add_subpackage('command')
+    config.add_subpackage('scons')
     config.add_subpackage('fcompiler')
     config.add_data_dir('tests')
     config.add_data_files('site.cfg')

Modified: branches/numpy.scons/numpy/scons_fake/__init__.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/__init__.py	2007-09-24 15:33:26 UTC (rev 4116)
+++ branches/numpy.scons/numpy/scons_fake/__init__.py	2007-09-24 16:37:13 UTC (rev 4117)
@@ -1,6 +1,6 @@
-from numpy.ctypeslib import load_library
+from foo_py import foo
 
-_FOO = load_library("foo", __file__)
-def foo():
-    _FOO.foo()
-    
+__all__ = ['foo']
+def test(level=1, verbosity=1):
+    from numpy.testing import NumpyTest
+    return NumpyTest().test(level, verbosity)

Modified: branches/numpy.scons/numpy/scons_fake/setup.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/setup.py	2007-09-24 15:33:26 UTC (rev 4116)
+++ branches/numpy.scons/numpy/scons_fake/setup.py	2007-09-24 16:37:13 UTC (rev 4117)
@@ -33,15 +33,10 @@
     from numpy.distutils.system_info import get_info
     config = Configuration('scons_fake',parent_package,top_path)
 
-    ## print "==================================================="
-    ## print "parent package is %s, top path %s" % (parent_package, top_path)
-    ## print "THIS package is %s" % config.name
-    ## print "THIS package path is %s" % config.package_path
-    #print get_object_names(['foo.c'])
-
     #config.add_library('_fortran_foo',
     #                   sources=['foo.f'])
     config.add_sconscript('SConstruct')
+    config.add_data_dir('tests')
     return config
 
 if __name__ == '__main__':

Added: branches/numpy.scons/numpy/scons_fake/tests/test_foo_py.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/tests/test_foo_py.py	2007-09-24 15:33:26 UTC (rev 4116)
+++ branches/numpy.scons/numpy/scons_fake/tests/test_foo_py.py	2007-09-24 16:37:13 UTC (rev 4117)
@@ -0,0 +1,10 @@
+from numpy.testing import *
+
+from numpy.scons_fake import foo
+
+class test_ra(NumpyTestCase):
+    def test(self):
+        foo()
+
+if __name__ == "__main__":
+    NumpyTest('numpy.scons_fake.foo').run()



More information about the Numpy-svn mailing list