diff --git a/scikits/learn/machine/setup.py b/scikits/learn/machine/setup.py index 11b3082758b23546a0447c7313d6547e412e672d..ef43ddd27e9957e9906a0d9eba0a8cd64870ebbf 100644 --- a/scikits/learn/machine/setup.py +++ b/scikits/learn/machine/setup.py @@ -1,6 +1,9 @@ - def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration + print "=============================================" + print "parent package is %s" % parent_package + print "top path is %s" % top_path + print "=============================================" config = Configuration('machine',parent_package,top_path) config.add_subpackage('pyem') config.add_subpackage('svm') diff --git a/scikits/learn/machine/svm/setup.py b/scikits/learn/machine/svm/setup.py index c17cfae326a8f56e3fe23329add1133814490efb..93e83e1ea27ff390e67912ea9ce5ea6ae9eaa326 100644 --- a/scikits/learn/machine/svm/setup.py +++ b/scikits/learn/machine/svm/setup.py @@ -14,6 +14,6 @@ def configuration(parent_package='', top_path=None, package_name='svm'): if __name__ == '__main__': from numpy.distutils.core import setup - #setup(**configuration(top_path='', - # package_name='scipy.sandbox.svm').todict()) - setup(configuration=configuration) + setup(**configuration(top_path='', + package_name='svm').todict()) + #setup(configuration=configuration) diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py new file mode 100644 index 0000000000000000000000000000000000000000..f0f2aa76d8f467c5276470d2a47373bef26197b1 --- /dev/null +++ b/scikits/learn/setup.py @@ -0,0 +1,17 @@ +def configuration(parent_package='',top_path=None): + from numpy.distutils.misc_util import Configuration + print "=============================================" + print "parent package is %s" % parent_package + print "top path is %s" % top_path + print "=============================================" + config = Configuration('',parent_package,top_path) + config.add_subpackage('utils') + config.add_subpackage('datasets') + config.add_subpackage('machine') + #config.make_svn_version_py() # installs __svn_version__.py + #config.make_config_py() + return config + +if __name__ == '__main__': + from numpy.distutils.core import setup + setup(**configuration(top_path='').todict()) diff --git a/setup.py b/setup.py index 46e6cdb548d8b3a1bdad316e4443c24d38a5be6e..194d056983114ecc7e04533be7b6e2495d81bee4 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -# Last Change: Sat Jul 21 03:00 PM 2007 J +# Last Change: Sat Jul 21 09:00 PM 2007 J # Copyright (C) 2007 Cournapeau David <cournape@gmail.com> # @@ -28,7 +28,7 @@ from numpy.distutils.core import setup, Extension def configuration(parent_package='',top_path=None, package_name=DISTNAME): if os.path.exists('MANIFEST'): os.remove('MANIFEST') - pkg_prefix_dir = os.path.join('scikits', 'learn') + #pkg_prefix_dir = os.path.join('scikits', 'learn') ## Get the version #from scikits.pyaudiolab.info import __version__ as pyaudiolab_version @@ -42,7 +42,7 @@ def configuration(parent_package='',top_path=None, package_name=DISTNAME): url = URL, download_url = DOWNLOAD_URL, long_description = LONG_DESCRIPTION) - config.add_subpackage('scikits.learn.machine') + config.add_subpackage('scikits/learn') return config @@ -50,7 +50,8 @@ if __name__ == "__main__": setup(configuration = configuration, install_requires='numpy', # can also add version specifiers namespace_packages=['scikits'], - packages=setuptools.find_packages(), + #packages=setuptools.find_packages(), + packages=['scikits'], include_package_data = True, #package_data = {'scikits.pyaudiolab': data_files}, test_suite="tester", # for python setup.py test