Solves import problems wih Python code

facemovie/FaceParams.py

@@ -9,7 +9,7 @@
 import cv
 import os
 
-from facemovie import training_types
+import training_types
 
 class FaceParams(object):
     '''

facemovie/Facemovie.py

@@ -14,8 +14,8 @@ import sys
 
 import cv
 
-from facemovie.lib import exif
-from facemovie import Guy
+from lib import exif
+import Guy
 
 class FaceMovie(object):
     '''

run.sh

@@ -2,8 +2,8 @@
 
 echo "Running FaceMovie from Script !"
 
-ROOT="./facemovie"
-IN_DATA="data/input/Aurelie"
+ROOT="."
+IN_DATA="data/input/samples"
 OUT_DATA="data/output"
 
-python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA -t i
+python ${ROOT}/Facemoviefier.py -r $ROOT -i $IN_DATA -o $OUT_DATA

run_windows.sh

@@ -1,11 +0,0 @@
-#! /bin/sh
-
-## Used through bash using git bash
-
-echo "Running FaceMovie from Script !"
-
-ROOT="./dist"
-IN_DATA="data/input/sample"
-OUT_DATA="data/output"
-
-${ROOT}/Facemoviefier.exe -r $ROOT -i $IN_DATA -o $OUT_DATA

setup.py

@@ -46,14 +46,14 @@ haar_files = find_data_files('facemovie','',['haarcascades/*.xml'])
 
 setup(
     name = "Facemovie",
-    version = "0.4",
+    version = "0.8.1",
     author = "Julien Lengrand-Lambert",
     author_email = "jlengrand@gmail.com",
-    description = ("An application aiming at creating a video of faces for people taking 'one picture a day' of themselves"),
+    description = ("Take one picture of yourself a day, automatically generate a movie!"),
     license = "BSD License",
     keywords = "image_processing computer_vision one_picture_a_day photography",
-    url = "https://github.com/jlengrand/FaceMovie",
-    download_url = "https://github.com/jlengrand/FaceMovie", # FIXME : To be updated
+    url = "http://jlengrand.github.com/FaceMovie/",
+    download_url = "http://jlengrand.github.com/FaceMovie/", # FIXME : To be updated
     packages=['facemovie', 'facemovie.lib', 'facemovie.haarcascades'],
     long_description=read('README.markdown'),
     classifiers=[
@@ -69,6 +69,6 @@ setup(
 	data_files = haar_files,
     options = {'py2exe': {'bundle_files': 1, # 3 dont bundle, 2 bundle but python interpreter, 1 bundle everything
                           'includes': ['numpy'] } },
-    console=['facemovie/Facemoviefier.py'],
+    console=['Facemoviefier.py'],
     zipfile = None,
 )