consolidate package listing and version info into neuroimaging package

lib/neuroimaging/__init__.py

@@ -3,5 +3,31 @@
 import fmri
 import statistics
 import visualization
+import re
 
+__version__ = "0.01a"
 
+packages = (
+  'neuroimaging',
+  'neuroimaging.tests',
+  'neuroimaging.statistics',
+  'neuroimaging.statistics.tests',
+  'neuroimaging.image',
+  'neuroimaging.image.tests',
+  'neuroimaging.reference',
+  'neuroimaging.reference.tests',
+  'neuroimaging.data',
+  'neuroimaging.data.tests',
+  'neuroimaging.image.formats',
+  'neuroimaging.image.formats.tests',
+  'neuroimaging.image.formats.analyze',
+  'neuroimaging.fmri',
+  'neuroimaging.fmri.tests',
+  'neuroimaging.fmri.fmristat',
+  'neuroimaging.fmri.fmristat.tests',
+  'neuroimaging.visualization',
+  'neuroimaging.visualization.cmap',
+  'neuroimaging.visualization.tests')
+
+testmatch = re.compile(".*tests").search
+nontest_packages = [p for p in packages if not testmatch(p)]

lib/neuroimaging/tests/__init__.py

@@ -3,18 +3,7 @@
 from glob import glob
 from os.path import join, dirname, basename
 
-packages = (
-    'neuroimaging',
-    'neuroimaging.statistics',
-    'neuroimaging.image',
-    'neuroimaging.reference',
-    'neuroimaging.data',
-    'neuroimaging.image.formats',
-    'neuroimaging.image.formats.analyze',
-    'neuroimaging.fmri',
-    'neuroimaging.fmri.fmristat',
-    'neuroimaging.visualization',
-    'neuroimaging.visualization.cmap')
+from neuroimaging import nontest_packages
 
 #-----------------------------------------------------------------------------
 def import_from(modulename, objectname):
@@ -69,5 +58,5 @@ def test_package(packname, testname=None):
 
 #-----------------------------------------------------------------------------
 def test_all():
-    for packname in packages: test_package(packname)
+    for packname in nontest_packages: test_package(packname)
 

setup.py

@@ -1,34 +1,13 @@
 import os, glob, string, shutil
+import sys
+sys.path.insert(0,"lib")
 from distutils.core import setup
-
-# Packages
-
-packages = ['neuroimaging',
-            'neuroimaging.tests',
-            'neuroimaging.statistics',
-            'neuroimaging.statistics.tests',
-            'neuroimaging.image',
-            'neuroimaging.image.tests',
-            'neuroimaging.reference',
-            'neuroimaging.reference.tests',
-            'neuroimaging.data',
-            'neuroimaging.data.tests',
-            'neuroimaging.image.formats',
-            'neuroimaging.image.formats.tests',
-            'neuroimaging.image.formats.analyze',
-            'neuroimaging.fmri',
-            'neuroimaging.fmri.tests',
-            'neuroimaging.fmri.fmristat',
-            'neuroimaging.fmri.fmristat.tests',
-            'neuroimaging.visualization',
-            'neuroimaging.visualization.cmap',
-            'neuroimaging.visualization.tests']
-
+from neuroimaging import packages, __version__
 
 def main():
 
-    setup (name = 'neuroimaging',
-           version = '0.01a',
+    setup( name = 'neuroimaging',
+           version = __version__,
            description = 'This is a neuroimaging python package',
            author = 'Various, one of whom is Jonathan Taylor',
            author_email = 'jonathan.taylor@stanford.edu',
@@ -40,10 +19,5 @@ def main():
            '''
            ''')
 
-
-
-if __name__ == "__main__":
-    main()
-
 
-    
+if __name__ == "__main__": main()