Merge pull request #44 from pradal/namespace

Namespace

Author: pradal

container

@@ -1,12 +1,11 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 #from openalea.deploy.metainfo import read_metainfo
 
 #metadata = read_metainfo('metainfo.ini', verbose=True)
 #for key, value in zip(metadata.keys(), metadata.values()):
 #    exec("%s = '%s'" % (key, value))
 
 name = 'openalea.image'
-version = '2.2.0' # TODO: replace by a version.py
 description = 'Image manipulation'
 long_description = description+ ' for VisuAlea from the OpenAlea platform.'
 authors = 'Jerome Chopard, Eric Moscardi and Christophe Pradal'
@@ -15,14 +14,19 @@
 license = 'Cecill-C'
 
 pkg_root_dir = 'src'
-packages = find_packages('src')
+packages = find_namespace_packages(where='src', include=['openalea.*'])
 package_dir = dict([('', 'src')])
 
 # Meta information
 long_description = '''
 Image contains algorithms to play with data images
 and visualea nodes to wrap numpy algorithms
 '''
+# find version number in src/openalea/image/version.py
+_version = {}
+with open("src/openalea/image/version.py") as fp:
+    exec(fp.read(), _version)
+    version = _version["__version__"]
 
 ###########
 #

image/setup.py

@@ -8,7 +8,7 @@
 MAJOR = 2
 """(int) Version major component."""
 
-MINOR = 0
+MINOR = 1
 """(int) Version minor component."""
 
 POST = 0

image/src/openalea/__init__.py

@@ -1,16 +1,12 @@
 # -*- coding: utf-8 -*-
 """setup file for stdlib package"""
-__revision__ = "$Id: $"
 
 import os
-from setuptools import setup, find_packages
-
-__license__ = 'Cecill-C'
-__revision__ = "$Id: $"
+from setuptools import setup, find_namespace_packages
 
 pj = os.path.join
 
-# find version number in src/openalea/core/version.py
+# find version number in src/openalea/numpy_wralea/version.py
 _version = {}
 with open("src/openalea/numpy_wralea/version.py") as fp:
     exec(fp.read(), _version)
@@ -27,8 +23,7 @@
 url = 'https://github.com/openalea/openalea-components'
 license = 'Cecill-C'
 
-pkgs = find_packages('src')
-packages = pkgs
+packages = find_namespace_packages(where='src', include=['openalea.*'])
 package_dir = {'':'src'}
 
 setup_requires = ['openalea.deploy']

stdlib/src/openalea/version.py renamed to image/src/openalea/image/version.py

@@ -6,7 +6,7 @@
 MAJOR = 2
 """(int) Version major component."""
 
-MINOR = 1
+MINOR = 2
 """(int) Version minor component."""
 
 POST = 0

numpy/setup.py

@@ -1,55 +1,40 @@
 # -*- coding: utf-8 -*-
 """setup file for pandas package"""
-__revision__ = "$Id$"
 
 import os
-from setuptools import setup, find_packages
-
-__license__ = 'Cecill-C' 
-__revision__ = "$Id$"
-
-pj = os.path.join
-
-from openalea.deploy.metainfo import read_metainfo
-metadata = read_metainfo('metainfo.ini', verbose=True)
-for key,value in metadata.iteritems():
-    exec("%s = '%s'" % (key, value))
-
-pkgs = [ pkg for pkg in find_packages('src') if namespace not in pkg] 
-top_pkgs = [pkg for pkg in pkgs if  len(pkg.split('.')) < 2]
-packages = [ namespace + "." + pkg for pkg in pkgs]
-package_dir = dict( [('','src')] + [(namespace + "." + pkg,  "src/" + pkg) for pkg in top_pkgs] )
+from setuptools import setup, find_namespace_packages
+# find version number in src/openalea/core/version.py
+_version = {}
+with open("src/openalea/pandas_wralea/version.py") as fp:
+    exec(fp.read(), _version)
+    version = _version["__version__"]
+
+name = "OpenAlea.Pandas"
+description = "Pandas modules for Visualea."
+long_description = "Interfaces some of the `Pandas <http://pandas.pydata.org/>`_ functionalities as nodes in VisuAlea." 
+authors = "Christophe Pradal"
+authors_email = "christophe.pradal at cirad.fr"
+url = "http://openalea.rtfd.io"
+license = "Cecill-C"
+
+packages = find_namespace_packages(where='src', include=['openalea.*'])
 
 setup(
     name=name,
     version=version,
-    description=description, 
-    long_description = '',
-    author = authors,
-    author_email = authors_email,
-    url = url,
-    license = license,
-
-    namespace_packages = ['openalea'],
-    create_namespaces=True,
-    zip_safe=False,
-
-    packages=packages,
-
-    package_dir=package_dir,
-
-    # Add package platform libraries if any
-    include_package_data=True,
+    description=description,
+    author=authors,
+    author_email=authors_email,
+    url=url,
+    license=license,
+
+    packages = packages,
+    package_dir={ '' : 'src' },
+    include_package_data = True,
+    zip_safe = False,
     package_data = {'' : ['*.csv'],},
 
-    # Dependencies
-    setup_requires = ['openalea.deploy'],
-    install_requires = ['openalea.core', 'pandas'],
-    dependency_links = ['http://openalea.gforge.inria.fr/pi'],
-
-    # entry_points
     entry_points = {
         "wralea": ['openalea.pandas = openalea.pandas_wralea'],
-        },
-
-    )
+    }
+)

numpy/src/openalea/__init__.py

@@ -0,0 +1,16 @@
+"""
+Maintain version for this package.
+"""
+
+
+MAJOR = 2
+"""(int) Version major component."""
+
+MINOR = 3
+"""(int) Version minor component."""
+
+POST = 0
+"""(int) Version post or bugfix component."""
+
+__version__ = ".".join([str(s) for s in (MAJOR, MINOR, POST)])
+

numpy/src/openalea/numpy_wralea/version.py

@@ -1,8 +1,7 @@
 import os
 pj = os.path.join
 
-from setuptools import setup, find_packages
-from openalea.deploy.metainfo import read_metainfo
+from setuptools import setup, find_namespace_packages
 
 # find version number in src/openalea/core/version.py
 _version = {}
@@ -18,6 +17,8 @@
 url = "http://openalea.rtfd.io"
 license = "Cecill-C"
 
+packages = find_namespace_packages(where='src', include=['openalea.*'])
+
 setup(
     name=name,
     version=version,
@@ -27,9 +28,8 @@
     url=url,
     license=license,
 
-    #namespace_packages=['openalea'],
 
-    packages = find_packages('src'),
+    packages = packages,
     package_dir={ '' : 'src' },
     include_package_data = True,
     zip_safe = False,

pandas/metainfo.ini

@@ -6,7 +6,7 @@
 MAJOR = 2
 """(int) Version major component."""
 
-MINOR = 3
+MINOR = 4
 """(int) Version minor component."""
 
 POST = 0

pandas/setup.cfg

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-__revision__ = "$Id: setup.py 2249 2010-02-08 17:27:37Z cokelaer $"
 
 import sys
 import os
 
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 # find version number in src/openalea/core/version.py
 _version = {}
@@ -21,8 +20,7 @@
 url = 'https://openalea.rtfd.io'
 license = 'Cecill-C'
 
-pkgs = find_packages('src')
-packages = pkgs
+packages = find_namespace_packages(where='src', include=['openalea.*'])
 package_dir = {'':'src'}
 
 setup_requires = ['openalea.deploy']

pandas/setup.py

@@ -6,7 +6,7 @@
 MAJOR = 2
 """(int) Version major component."""
 
-MINOR = 1
+MINOR = 2
 """(int) Version minor component."""
 
 POST = 0