From 141297fd71897ed69b835059d8d2a96d5eccc641 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Wed, 6 Jan 2010 09:00:54 +0000
Subject: [PATCH] Put back changes which somewhat were not commited before for
 setup in em sub package

From: cdavid <cdavid@cb17146a-f446-4be1-a4f7-bd7c5bb65646>

git-svn-id: https://scikit-learn.svn.sourceforge.net/svnroot/scikit-learn/trunk@227 22fbfee3-77ab-4535-9bad-27d1bd3bc7d8
---
 scikits/learn/datasets/pendigits/setup.py | 12 ++++++++++++
 scikits/learn/machine/em/setup.py         |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 scikits/learn/datasets/pendigits/setup.py

diff --git a/scikits/learn/datasets/pendigits/setup.py b/scikits/learn/datasets/pendigits/setup.py
new file mode 100644
index 0000000000..bc27b247f2
--- /dev/null
+++ b/scikits/learn/datasets/pendigits/setup.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('pendigits',parent_package,top_path)
+    config.add_subpackage('training')
+    config.add_subpackage('testing')
+    config.make_config_py() # installs __config__.py
+    return config
+
+if __name__ == '__main__':
+    print 'This is the wrong setup.py file to run'
diff --git a/scikits/learn/machine/em/setup.py b/scikits/learn/machine/em/setup.py
index c3cf4e47fa..3ee46fd229 100644
--- a/scikits/learn/machine/em/setup.py
+++ b/scikits/learn/machine/em/setup.py
@@ -4,7 +4,7 @@
 #   - check how to handle cmd line build options with distutils and use
 #   it in the building process
 
-""" pyem is a small python package to estimate Gaussian Mixtures Models
+"""This is a small python package to estimate Gaussian Mixtures Models
 from data, using Expectation Maximization.
 
 Maximum likelihood EM for mixture of Gaussian is implemented, with BIC computation
@@ -17,18 +17,19 @@ for estimating meta parameters of mixtures. """
 from os.path import join
 from info import version as pyem_version
 
-DISTNAME    = 'pyem' 
+DISTNAME    = 'em' 
 VERSION     = pyem_version
 DESCRIPTION ='A python module for Expectation Maximization learning of mixtures pdf',
 AUTHOR      ='David Cournapeau',
 AUTHOR_EMAIL='david@ar.media.kyoto-u.ac.jp',
 URL         ='http://ar.media.kyoto-u.ac.jp/members/david/softwares/pyem',
 
-def configuration(parent_package='',top_path=None, package_name='pyem'):
+def configuration(parent_package='',top_path=None, package_name='em'):
     from numpy.distutils.misc_util import Configuration
     config = Configuration(package_name,parent_package,top_path,
              version     = VERSION)
     #config.add_subpackage('data')
+    config.add_data_dir('examples')
     config.add_data_dir('tests')
     config.add_data_dir('profile_data')
     config.add_extension('c_gden',
-- 
GitLab