From 055aaaa689fc185d7fdabbda47c54c385ce6e423 Mon Sep 17 00:00:00 2001 From: pradal Date: Sat, 17 Feb 2018 01:29:26 +0100 Subject: [PATCH] Move layout to openalea. Enhance setup --- setup.py | 10 ++++++---- src/openalea/sconsx/__init__.py | 11 ----------- src/{ => openalea}/sconsx/config.py | 0 src/{ => openalea}/sconsx/cython.py | 0 src/{ => openalea}/sconsx/environ.py | 0 src/{ => openalea}/sconsx/errormsg.py | 0 src/{ => openalea}/sconsx/f2py.py | 0 src/{ => openalea}/sconsx/lex.py | 0 src/{ => openalea}/sconsx/qt4.py | 0 src/{ => openalea}/sconsx/qt5.py | 0 src/{ => openalea}/sconsx/tools/README | 0 src/{sconsx => openalea/sconsx/tools}/__init__.py | 0 src/{ => openalea}/sconsx/tools/alea.py | 0 src/{ => openalea}/sconsx/tools/ann.py | 0 src/{ => openalea}/sconsx/tools/bison.py | 0 src/{ => openalea}/sconsx/tools/boost.py | 0 src/{ => openalea}/sconsx/tools/boost_base.py | 0 src/{ => openalea}/sconsx/tools/boost_math_c99.py | 0 src/{ => openalea}/sconsx/tools/boost_python.py | 0 src/{ => openalea}/sconsx/tools/boost_thread.py | 0 src/{ => openalea}/sconsx/tools/builddir.py | 0 src/{ => openalea}/sconsx/tools/cgal.py | 0 src/{ => openalea}/sconsx/tools/compiler.py | 0 src/{ => openalea}/sconsx/tools/cython.py | 0 src/{ => openalea}/sconsx/tools/egglib.py | 0 src/{ => openalea}/sconsx/tools/eigen.py | 0 src/{ => openalea}/sconsx/tools/f2py.py | 0 src/{ => openalea}/sconsx/tools/flex.py | 0 src/{ => openalea}/sconsx/tools/gcc.py | 0 src/{ => openalea}/sconsx/tools/glut.py | 0 src/{ => openalea}/sconsx/tools/gmp.py | 0 src/{ => openalea}/sconsx/tools/gnuplot.py | 0 src/{ => openalea}/sconsx/tools/install.py | 0 src/{ => openalea}/sconsx/tools/lapack.py | 0 src/{ => openalea}/sconsx/tools/mingw.py | 0 src/{ => openalea}/sconsx/tools/mpfr.py | 0 src/{ => openalea}/sconsx/tools/msvc.py | 0 src/{ => openalea}/sconsx/tools/multicpu.py | 0 src/{ => openalea}/sconsx/tools/opengl.py | 0 src/{ => openalea}/sconsx/tools/pthread.py | 0 src/{ => openalea}/sconsx/tools/python.py | 0 src/{ => openalea}/sconsx/tools/qhull.py | 0 src/{ => openalea}/sconsx/tools/qt.py | 0 src/{ => openalea}/sconsx/tools/qt4.py | 0 src/{ => openalea}/sconsx/tools/qt5.py | 0 src/{ => openalea}/sconsx/tools/readline.py | 0 src/{ => openalea}/sconsx/tools/termcap.py | 0 .../tools => openalea/sconsx/util}/__init__.py | 0 src/{ => openalea}/sconsx/util/buildprefix.py | 0 src/{ => openalea}/sconsx/util/config_deploy.py | 0 src/{ => openalea}/sconsx/util/env_check.py | 0 src/{ => openalea}/sconsx/util/hexversion.py | 0 src/{ => openalea}/sconsx/util/lib_check.py | 0 src/{ => openalea}/sconsx/util/qt_check.py | 0 src/{ => openalea}/sconsx/yacc.py | 0 src/sconsx/util/__init__.py | 0 56 files changed, 6 insertions(+), 15 deletions(-) rename src/{ => openalea}/sconsx/config.py (100%) rename src/{ => openalea}/sconsx/cython.py (100%) rename src/{ => openalea}/sconsx/environ.py (100%) rename src/{ => openalea}/sconsx/errormsg.py (100%) rename src/{ => openalea}/sconsx/f2py.py (100%) rename src/{ => openalea}/sconsx/lex.py (100%) rename src/{ => openalea}/sconsx/qt4.py (100%) rename src/{ => openalea}/sconsx/qt5.py (100%) rename src/{ => openalea}/sconsx/tools/README (100%) rename src/{sconsx => openalea/sconsx/tools}/__init__.py (100%) rename src/{ => openalea}/sconsx/tools/alea.py (100%) rename src/{ => openalea}/sconsx/tools/ann.py (100%) rename src/{ => openalea}/sconsx/tools/bison.py (100%) rename src/{ => openalea}/sconsx/tools/boost.py (100%) rename src/{ => openalea}/sconsx/tools/boost_base.py (100%) rename src/{ => openalea}/sconsx/tools/boost_math_c99.py (100%) rename src/{ => openalea}/sconsx/tools/boost_python.py (100%) rename src/{ => openalea}/sconsx/tools/boost_thread.py (100%) rename src/{ => openalea}/sconsx/tools/builddir.py (100%) rename src/{ => openalea}/sconsx/tools/cgal.py (100%) rename src/{ => openalea}/sconsx/tools/compiler.py (100%) rename src/{ => openalea}/sconsx/tools/cython.py (100%) rename src/{ => openalea}/sconsx/tools/egglib.py (100%) rename src/{ => openalea}/sconsx/tools/eigen.py (100%) rename src/{ => openalea}/sconsx/tools/f2py.py (100%) rename src/{ => openalea}/sconsx/tools/flex.py (100%) rename src/{ => openalea}/sconsx/tools/gcc.py (100%) rename src/{ => openalea}/sconsx/tools/glut.py (100%) rename src/{ => openalea}/sconsx/tools/gmp.py (100%) rename src/{ => openalea}/sconsx/tools/gnuplot.py (100%) rename src/{ => openalea}/sconsx/tools/install.py (100%) rename src/{ => openalea}/sconsx/tools/lapack.py (100%) rename src/{ => openalea}/sconsx/tools/mingw.py (100%) rename src/{ => openalea}/sconsx/tools/mpfr.py (100%) rename src/{ => openalea}/sconsx/tools/msvc.py (100%) rename src/{ => openalea}/sconsx/tools/multicpu.py (100%) rename src/{ => openalea}/sconsx/tools/opengl.py (100%) rename src/{ => openalea}/sconsx/tools/pthread.py (100%) rename src/{ => openalea}/sconsx/tools/python.py (100%) rename src/{ => openalea}/sconsx/tools/qhull.py (100%) rename src/{ => openalea}/sconsx/tools/qt.py (100%) rename src/{ => openalea}/sconsx/tools/qt4.py (100%) rename src/{ => openalea}/sconsx/tools/qt5.py (100%) rename src/{ => openalea}/sconsx/tools/readline.py (100%) rename src/{ => openalea}/sconsx/tools/termcap.py (100%) rename src/{sconsx/tools => openalea/sconsx/util}/__init__.py (100%) rename src/{ => openalea}/sconsx/util/buildprefix.py (100%) rename src/{ => openalea}/sconsx/util/config_deploy.py (100%) rename src/{ => openalea}/sconsx/util/env_check.py (100%) rename src/{ => openalea}/sconsx/util/hexversion.py (100%) rename src/{ => openalea}/sconsx/util/lib_check.py (100%) rename src/{ => openalea}/sconsx/util/qt_check.py (100%) rename src/{ => openalea}/sconsx/yacc.py (100%) delete mode 100644 src/sconsx/util/__init__.py diff --git a/setup.py b/setup.py index 9d3c90c..3841e2d 100644 --- 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 index e1f83ed..e69de29 100644 --- 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 b/src/openalea/sconsx/config.py similarity index 100% rename from src/sconsx/config.py rename to src/openalea/sconsx/config.py diff --git a/src/sconsx/cython.py b/src/openalea/sconsx/cython.py similarity index 100% rename from src/sconsx/cython.py rename to src/openalea/sconsx/cython.py diff --git a/src/sconsx/environ.py b/src/openalea/sconsx/environ.py similarity index 100% rename from src/sconsx/environ.py rename to src/openalea/sconsx/environ.py diff --git a/src/sconsx/errormsg.py b/src/openalea/sconsx/errormsg.py similarity index 100% rename from src/sconsx/errormsg.py rename to src/openalea/sconsx/errormsg.py diff --git a/src/sconsx/f2py.py b/src/openalea/sconsx/f2py.py similarity index 100% rename from src/sconsx/f2py.py rename to src/openalea/sconsx/f2py.py diff --git a/src/sconsx/lex.py b/src/openalea/sconsx/lex.py similarity index 100% rename from src/sconsx/lex.py rename to src/openalea/sconsx/lex.py diff --git a/src/sconsx/qt4.py b/src/openalea/sconsx/qt4.py similarity index 100% rename from src/sconsx/qt4.py rename to src/openalea/sconsx/qt4.py diff --git a/src/sconsx/qt5.py b/src/openalea/sconsx/qt5.py similarity index 100% rename from src/sconsx/qt5.py rename to src/openalea/sconsx/qt5.py diff --git a/src/sconsx/tools/README b/src/openalea/sconsx/tools/README similarity index 100% rename from src/sconsx/tools/README rename to src/openalea/sconsx/tools/README diff --git a/src/sconsx/__init__.py b/src/openalea/sconsx/tools/__init__.py similarity index 100% rename from src/sconsx/__init__.py rename to src/openalea/sconsx/tools/__init__.py diff --git a/src/sconsx/tools/alea.py b/src/openalea/sconsx/tools/alea.py similarity index 100% rename from src/sconsx/tools/alea.py rename to src/openalea/sconsx/tools/alea.py diff --git a/src/sconsx/tools/ann.py b/src/openalea/sconsx/tools/ann.py similarity index 100% rename from src/sconsx/tools/ann.py rename to src/openalea/sconsx/tools/ann.py diff --git a/src/sconsx/tools/bison.py b/src/openalea/sconsx/tools/bison.py similarity index 100% rename from src/sconsx/tools/bison.py rename to src/openalea/sconsx/tools/bison.py diff --git a/src/sconsx/tools/boost.py b/src/openalea/sconsx/tools/boost.py similarity index 100% rename from src/sconsx/tools/boost.py rename to src/openalea/sconsx/tools/boost.py diff --git a/src/sconsx/tools/boost_base.py b/src/openalea/sconsx/tools/boost_base.py similarity index 100% rename from src/sconsx/tools/boost_base.py rename to src/openalea/sconsx/tools/boost_base.py diff --git a/src/sconsx/tools/boost_math_c99.py b/src/openalea/sconsx/tools/boost_math_c99.py similarity index 100% rename from src/sconsx/tools/boost_math_c99.py rename to src/openalea/sconsx/tools/boost_math_c99.py diff --git a/src/sconsx/tools/boost_python.py b/src/openalea/sconsx/tools/boost_python.py similarity index 100% rename from src/sconsx/tools/boost_python.py rename to src/openalea/sconsx/tools/boost_python.py diff --git a/src/sconsx/tools/boost_thread.py b/src/openalea/sconsx/tools/boost_thread.py similarity index 100% rename from src/sconsx/tools/boost_thread.py rename to src/openalea/sconsx/tools/boost_thread.py diff --git a/src/sconsx/tools/builddir.py b/src/openalea/sconsx/tools/builddir.py similarity index 100% rename from src/sconsx/tools/builddir.py rename to src/openalea/sconsx/tools/builddir.py diff --git a/src/sconsx/tools/cgal.py b/src/openalea/sconsx/tools/cgal.py similarity index 100% rename from src/sconsx/tools/cgal.py rename to src/openalea/sconsx/tools/cgal.py diff --git a/src/sconsx/tools/compiler.py b/src/openalea/sconsx/tools/compiler.py similarity index 100% rename from src/sconsx/tools/compiler.py rename to src/openalea/sconsx/tools/compiler.py diff --git a/src/sconsx/tools/cython.py b/src/openalea/sconsx/tools/cython.py similarity index 100% rename from src/sconsx/tools/cython.py rename to src/openalea/sconsx/tools/cython.py diff --git a/src/sconsx/tools/egglib.py b/src/openalea/sconsx/tools/egglib.py similarity index 100% rename from src/sconsx/tools/egglib.py rename to src/openalea/sconsx/tools/egglib.py diff --git a/src/sconsx/tools/eigen.py b/src/openalea/sconsx/tools/eigen.py similarity index 100% rename from src/sconsx/tools/eigen.py rename to src/openalea/sconsx/tools/eigen.py diff --git a/src/sconsx/tools/f2py.py b/src/openalea/sconsx/tools/f2py.py similarity index 100% rename from src/sconsx/tools/f2py.py rename to src/openalea/sconsx/tools/f2py.py diff --git a/src/sconsx/tools/flex.py b/src/openalea/sconsx/tools/flex.py similarity index 100% rename from src/sconsx/tools/flex.py rename to src/openalea/sconsx/tools/flex.py diff --git a/src/sconsx/tools/gcc.py b/src/openalea/sconsx/tools/gcc.py similarity index 100% rename from src/sconsx/tools/gcc.py rename to src/openalea/sconsx/tools/gcc.py diff --git a/src/sconsx/tools/glut.py b/src/openalea/sconsx/tools/glut.py similarity index 100% rename from src/sconsx/tools/glut.py rename to src/openalea/sconsx/tools/glut.py diff --git a/src/sconsx/tools/gmp.py b/src/openalea/sconsx/tools/gmp.py similarity index 100% rename from src/sconsx/tools/gmp.py rename to src/openalea/sconsx/tools/gmp.py diff --git a/src/sconsx/tools/gnuplot.py b/src/openalea/sconsx/tools/gnuplot.py similarity index 100% rename from src/sconsx/tools/gnuplot.py rename to src/openalea/sconsx/tools/gnuplot.py diff --git a/src/sconsx/tools/install.py b/src/openalea/sconsx/tools/install.py similarity index 100% rename from src/sconsx/tools/install.py rename to src/openalea/sconsx/tools/install.py diff --git a/src/sconsx/tools/lapack.py b/src/openalea/sconsx/tools/lapack.py similarity index 100% rename from src/sconsx/tools/lapack.py rename to src/openalea/sconsx/tools/lapack.py diff --git a/src/sconsx/tools/mingw.py b/src/openalea/sconsx/tools/mingw.py similarity index 100% rename from src/sconsx/tools/mingw.py rename to src/openalea/sconsx/tools/mingw.py diff --git a/src/sconsx/tools/mpfr.py b/src/openalea/sconsx/tools/mpfr.py similarity index 100% rename from src/sconsx/tools/mpfr.py rename to src/openalea/sconsx/tools/mpfr.py diff --git a/src/sconsx/tools/msvc.py b/src/openalea/sconsx/tools/msvc.py similarity index 100% rename from src/sconsx/tools/msvc.py rename to src/openalea/sconsx/tools/msvc.py diff --git a/src/sconsx/tools/multicpu.py b/src/openalea/sconsx/tools/multicpu.py similarity index 100% rename from src/sconsx/tools/multicpu.py rename to src/openalea/sconsx/tools/multicpu.py diff --git a/src/sconsx/tools/opengl.py b/src/openalea/sconsx/tools/opengl.py similarity index 100% rename from src/sconsx/tools/opengl.py rename to src/openalea/sconsx/tools/opengl.py diff --git a/src/sconsx/tools/pthread.py b/src/openalea/sconsx/tools/pthread.py similarity index 100% rename from src/sconsx/tools/pthread.py rename to src/openalea/sconsx/tools/pthread.py diff --git a/src/sconsx/tools/python.py b/src/openalea/sconsx/tools/python.py similarity index 100% rename from src/sconsx/tools/python.py rename to src/openalea/sconsx/tools/python.py diff --git a/src/sconsx/tools/qhull.py b/src/openalea/sconsx/tools/qhull.py similarity index 100% rename from src/sconsx/tools/qhull.py rename to src/openalea/sconsx/tools/qhull.py diff --git a/src/sconsx/tools/qt.py b/src/openalea/sconsx/tools/qt.py similarity index 100% rename from src/sconsx/tools/qt.py rename to src/openalea/sconsx/tools/qt.py diff --git a/src/sconsx/tools/qt4.py b/src/openalea/sconsx/tools/qt4.py similarity index 100% rename from src/sconsx/tools/qt4.py rename to src/openalea/sconsx/tools/qt4.py diff --git a/src/sconsx/tools/qt5.py b/src/openalea/sconsx/tools/qt5.py similarity index 100% rename from src/sconsx/tools/qt5.py rename to src/openalea/sconsx/tools/qt5.py diff --git a/src/sconsx/tools/readline.py b/src/openalea/sconsx/tools/readline.py similarity index 100% rename from src/sconsx/tools/readline.py rename to src/openalea/sconsx/tools/readline.py diff --git a/src/sconsx/tools/termcap.py b/src/openalea/sconsx/tools/termcap.py similarity index 100% rename from src/sconsx/tools/termcap.py rename to src/openalea/sconsx/tools/termcap.py diff --git a/src/sconsx/tools/__init__.py b/src/openalea/sconsx/util/__init__.py similarity index 100% rename from src/sconsx/tools/__init__.py rename to src/openalea/sconsx/util/__init__.py diff --git a/src/sconsx/util/buildprefix.py b/src/openalea/sconsx/util/buildprefix.py similarity index 100% rename from src/sconsx/util/buildprefix.py rename to src/openalea/sconsx/util/buildprefix.py diff --git a/src/sconsx/util/config_deploy.py b/src/openalea/sconsx/util/config_deploy.py similarity index 100% rename from src/sconsx/util/config_deploy.py rename to src/openalea/sconsx/util/config_deploy.py diff --git a/src/sconsx/util/env_check.py b/src/openalea/sconsx/util/env_check.py similarity index 100% rename from src/sconsx/util/env_check.py rename to src/openalea/sconsx/util/env_check.py diff --git a/src/sconsx/util/hexversion.py b/src/openalea/sconsx/util/hexversion.py similarity index 100% rename from src/sconsx/util/hexversion.py rename to src/openalea/sconsx/util/hexversion.py diff --git a/src/sconsx/util/lib_check.py b/src/openalea/sconsx/util/lib_check.py similarity index 100% rename from src/sconsx/util/lib_check.py rename to src/openalea/sconsx/util/lib_check.py diff --git a/src/sconsx/util/qt_check.py b/src/openalea/sconsx/util/qt_check.py similarity index 100% rename from src/sconsx/util/qt_check.py rename to src/openalea/sconsx/util/qt_check.py diff --git a/src/sconsx/yacc.py b/src/openalea/sconsx/yacc.py similarity index 100% rename from src/sconsx/yacc.py rename to src/openalea/sconsx/yacc.py diff --git a/src/sconsx/util/__init__.py b/src/sconsx/util/__init__.py deleted file mode 100644 index e69de29..0000000