Move layout to openalea. Enhance setup

openalea · Feb 17, 2018 · 055aaaa · 055aaaa
1 parent f09c55e
commit 055aaaa
Show file tree

Hide file tree

Showing 56 changed files with 6 additions and 15 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 __revision__ = "$Id$"
 
 import os, sys
-from setuptools import setup
+from setuptools import setup, find_packages
 
 pj= os.path.join
 
@@ -25,6 +25,9 @@
     * Support for different compilers on Linux and Windows (e.g. gcc, msvc, mingw)
 """
 
+packages=find_packages('src')
+package_dir={'': 'src'}
+
 setup(name = name,
       version = version,
       description = description,
@@ -37,9 +40,8 @@
       create_namespaces = True,
       zip_safe = False,
 
-      packages = ["openalea.sconsx", "openalea.sconsx.tools", "openalea.sconsx.util"],
-      package_dir = { pkg_name : pj('src','sconsx'),
-                      '' : 'src'},
+      packages=packages,
+      package_dir= package_dir,
 
       # Dependencies
       setup_requires = ['openalea.deploy'],

diff --git a/src/openalea/sconsx/__init__.py b/src/openalea/sconsx/__init__.py
@@ -1,11 +0,0 @@
-
-# Redirect path
-import os
-
-cdir = os.path.dirname(__file__)
-pdir = os.path.join(cdir, "../../sconsx")
-pdir = os.path.abspath(pdir)
-
-__path__ = [pdir] + __path__[:]
-
-from openalea.sconsx.__init__ import *

diff --git a/src/sconsx/config.py → src/openalea/sconsx/config.py b/src/sconsx/config.py → src/openalea/sconsx/config.py
diff --git a/src/sconsx/cython.py → src/openalea/sconsx/cython.py b/src/sconsx/cython.py → src/openalea/sconsx/cython.py
diff --git a/src/sconsx/environ.py → src/openalea/sconsx/environ.py b/src/sconsx/environ.py → src/openalea/sconsx/environ.py
diff --git a/src/sconsx/errormsg.py → src/openalea/sconsx/errormsg.py b/src/sconsx/errormsg.py → src/openalea/sconsx/errormsg.py
diff --git a/src/sconsx/f2py.py → src/openalea/sconsx/f2py.py b/src/sconsx/f2py.py → src/openalea/sconsx/f2py.py
diff --git a/src/sconsx/lex.py → src/openalea/sconsx/lex.py b/src/sconsx/lex.py → src/openalea/sconsx/lex.py
diff --git a/src/sconsx/qt4.py → src/openalea/sconsx/qt4.py b/src/sconsx/qt4.py → src/openalea/sconsx/qt4.py
diff --git a/src/sconsx/qt5.py → src/openalea/sconsx/qt5.py b/src/sconsx/qt5.py → src/openalea/sconsx/qt5.py
diff --git a/src/sconsx/tools/README → src/openalea/sconsx/tools/README b/src/sconsx/tools/README → src/openalea/sconsx/tools/README
diff --git a/src/sconsx/__init__.py → src/openalea/sconsx/tools/__init__.py b/src/sconsx/__init__.py → src/openalea/sconsx/tools/__init__.py
diff --git a/src/sconsx/tools/alea.py → src/openalea/sconsx/tools/alea.py b/src/sconsx/tools/alea.py → src/openalea/sconsx/tools/alea.py
diff --git a/src/sconsx/tools/ann.py → src/openalea/sconsx/tools/ann.py b/src/sconsx/tools/ann.py → src/openalea/sconsx/tools/ann.py
diff --git a/src/sconsx/tools/bison.py → src/openalea/sconsx/tools/bison.py b/src/sconsx/tools/bison.py → src/openalea/sconsx/tools/bison.py
diff --git a/src/sconsx/tools/boost.py → src/openalea/sconsx/tools/boost.py b/src/sconsx/tools/boost.py → src/openalea/sconsx/tools/boost.py
diff --git a/src/sconsx/tools/boost_base.py → src/openalea/sconsx/tools/boost_base.py b/src/sconsx/tools/boost_base.py → src/openalea/sconsx/tools/boost_base.py
diff --git a/src/sconsx/tools/boost_math_c99.py → src/openalea/sconsx/tools/boost_math_c99.py b/src/sconsx/tools/boost_math_c99.py → src/openalea/sconsx/tools/boost_math_c99.py
diff --git a/src/sconsx/tools/boost_python.py → src/openalea/sconsx/tools/boost_python.py b/src/sconsx/tools/boost_python.py → src/openalea/sconsx/tools/boost_python.py
diff --git a/src/sconsx/tools/boost_thread.py → src/openalea/sconsx/tools/boost_thread.py b/src/sconsx/tools/boost_thread.py → src/openalea/sconsx/tools/boost_thread.py
diff --git a/src/sconsx/tools/builddir.py → src/openalea/sconsx/tools/builddir.py b/src/sconsx/tools/builddir.py → src/openalea/sconsx/tools/builddir.py
diff --git a/src/sconsx/tools/cgal.py → src/openalea/sconsx/tools/cgal.py b/src/sconsx/tools/cgal.py → src/openalea/sconsx/tools/cgal.py
diff --git a/src/sconsx/tools/compiler.py → src/openalea/sconsx/tools/compiler.py b/src/sconsx/tools/compiler.py → src/openalea/sconsx/tools/compiler.py
diff --git a/src/sconsx/tools/cython.py → src/openalea/sconsx/tools/cython.py b/src/sconsx/tools/cython.py → src/openalea/sconsx/tools/cython.py
diff --git a/src/sconsx/tools/egglib.py → src/openalea/sconsx/tools/egglib.py b/src/sconsx/tools/egglib.py → src/openalea/sconsx/tools/egglib.py
diff --git a/src/sconsx/tools/eigen.py → src/openalea/sconsx/tools/eigen.py b/src/sconsx/tools/eigen.py → src/openalea/sconsx/tools/eigen.py
diff --git a/src/sconsx/tools/f2py.py → src/openalea/sconsx/tools/f2py.py b/src/sconsx/tools/f2py.py → src/openalea/sconsx/tools/f2py.py
diff --git a/src/sconsx/tools/flex.py → src/openalea/sconsx/tools/flex.py b/src/sconsx/tools/flex.py → src/openalea/sconsx/tools/flex.py
diff --git a/src/sconsx/tools/gcc.py → src/openalea/sconsx/tools/gcc.py b/src/sconsx/tools/gcc.py → src/openalea/sconsx/tools/gcc.py
diff --git a/src/sconsx/tools/glut.py → src/openalea/sconsx/tools/glut.py b/src/sconsx/tools/glut.py → src/openalea/sconsx/tools/glut.py
diff --git a/src/sconsx/tools/gmp.py → src/openalea/sconsx/tools/gmp.py b/src/sconsx/tools/gmp.py → src/openalea/sconsx/tools/gmp.py
diff --git a/src/sconsx/tools/gnuplot.py → src/openalea/sconsx/tools/gnuplot.py b/src/sconsx/tools/gnuplot.py → src/openalea/sconsx/tools/gnuplot.py
diff --git a/src/sconsx/tools/install.py → src/openalea/sconsx/tools/install.py b/src/sconsx/tools/install.py → src/openalea/sconsx/tools/install.py
diff --git a/src/sconsx/tools/lapack.py → src/openalea/sconsx/tools/lapack.py b/src/sconsx/tools/lapack.py → src/openalea/sconsx/tools/lapack.py
diff --git a/src/sconsx/tools/mingw.py → src/openalea/sconsx/tools/mingw.py b/src/sconsx/tools/mingw.py → src/openalea/sconsx/tools/mingw.py
diff --git a/src/sconsx/tools/mpfr.py → src/openalea/sconsx/tools/mpfr.py b/src/sconsx/tools/mpfr.py → src/openalea/sconsx/tools/mpfr.py
diff --git a/src/sconsx/tools/msvc.py → src/openalea/sconsx/tools/msvc.py b/src/sconsx/tools/msvc.py → src/openalea/sconsx/tools/msvc.py
diff --git a/src/sconsx/tools/multicpu.py → src/openalea/sconsx/tools/multicpu.py b/src/sconsx/tools/multicpu.py → src/openalea/sconsx/tools/multicpu.py
diff --git a/src/sconsx/tools/opengl.py → src/openalea/sconsx/tools/opengl.py b/src/sconsx/tools/opengl.py → src/openalea/sconsx/tools/opengl.py
diff --git a/src/sconsx/tools/pthread.py → src/openalea/sconsx/tools/pthread.py b/src/sconsx/tools/pthread.py → src/openalea/sconsx/tools/pthread.py
diff --git a/src/sconsx/tools/python.py → src/openalea/sconsx/tools/python.py b/src/sconsx/tools/python.py → src/openalea/sconsx/tools/python.py
diff --git a/src/sconsx/tools/qhull.py → src/openalea/sconsx/tools/qhull.py b/src/sconsx/tools/qhull.py → src/openalea/sconsx/tools/qhull.py
diff --git a/src/sconsx/tools/qt.py → src/openalea/sconsx/tools/qt.py b/src/sconsx/tools/qt.py → src/openalea/sconsx/tools/qt.py
diff --git a/src/sconsx/tools/qt4.py → src/openalea/sconsx/tools/qt4.py b/src/sconsx/tools/qt4.py → src/openalea/sconsx/tools/qt4.py
diff --git a/src/sconsx/tools/qt5.py → src/openalea/sconsx/tools/qt5.py b/src/sconsx/tools/qt5.py → src/openalea/sconsx/tools/qt5.py
diff --git a/src/sconsx/tools/readline.py → src/openalea/sconsx/tools/readline.py b/src/sconsx/tools/readline.py → src/openalea/sconsx/tools/readline.py
diff --git a/src/sconsx/tools/termcap.py → src/openalea/sconsx/tools/termcap.py b/src/sconsx/tools/termcap.py → src/openalea/sconsx/tools/termcap.py
diff --git a/src/sconsx/tools/__init__.py → src/openalea/sconsx/util/__init__.py b/src/sconsx/tools/__init__.py → src/openalea/sconsx/util/__init__.py
diff --git a/src/sconsx/util/buildprefix.py → src/openalea/sconsx/util/buildprefix.py b/src/sconsx/util/buildprefix.py → src/openalea/sconsx/util/buildprefix.py
diff --git a/src/sconsx/util/config_deploy.py → src/openalea/sconsx/util/config_deploy.py b/src/sconsx/util/config_deploy.py → src/openalea/sconsx/util/config_deploy.py
diff --git a/src/sconsx/util/env_check.py → src/openalea/sconsx/util/env_check.py b/src/sconsx/util/env_check.py → src/openalea/sconsx/util/env_check.py
diff --git a/src/sconsx/util/hexversion.py → src/openalea/sconsx/util/hexversion.py b/src/sconsx/util/hexversion.py → src/openalea/sconsx/util/hexversion.py
diff --git a/src/sconsx/util/lib_check.py → src/openalea/sconsx/util/lib_check.py b/src/sconsx/util/lib_check.py → src/openalea/sconsx/util/lib_check.py
diff --git a/src/sconsx/util/qt_check.py → src/openalea/sconsx/util/qt_check.py b/src/sconsx/util/qt_check.py → src/openalea/sconsx/util/qt_check.py
diff --git a/src/sconsx/yacc.py → src/openalea/sconsx/yacc.py b/src/sconsx/yacc.py → src/openalea/sconsx/yacc.py
diff --git a/src/sconsx/util/__init__.py b/src/sconsx/util/__init__.py