From eed58abe04c98fd420f60e68c66572cf943e3b9f Mon Sep 17 00:00:00 2001 From: thomasarsouze Date: Mon, 22 Jan 2024 14:21:47 +0100 Subject: [PATCH 1/2] Update namespace --- setup.py | 4 ++-- src/openalea/__init__.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 src/openalea/__init__.py diff --git a/setup.py b/setup.py index da8dc8d..57ac6b3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # {# pkglts, pysetup.kwds # format setup arguments -from setuptools import setup, find_packages +from setuptools import setup, find_namespace_packages short_descr = "Multiscale Tree Graph datastructure and interfaces" @@ -31,7 +31,7 @@ license='cecill-c', zip_safe=False, - packages=find_packages('src'), + packages=find_namespace_packages(where='src', include=['openalea', 'openalea.*']), package_dir={'': 'src'}, entry_points={}, keywords='', diff --git a/src/openalea/__init__.py b/src/openalea/__init__.py deleted file mode 100644 index a9a6a7a..0000000 --- a/src/openalea/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ - -# {#pkglts, -__import__('pkg_resources').declare_namespace(__name__) -# #} From 7eaf797573b0c27359fec398f3ae6c6af3f8fa18 Mon Sep 17 00:00:00 2001 From: thomasarsouze Date: Mon, 22 Jan 2024 15:10:39 +0100 Subject: [PATCH 2/2] Update version number and setup.py --- setup.py | 12 ++++++------ src/openalea/mtg/version.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 57ac6b3..31210e9 100644 --- a/setup.py +++ b/setup.py @@ -14,27 +14,27 @@ # find version number in src/openalea/mtg/version.py -version = {} +_version = {} with open("src/openalea/mtg/version.py") as fp: - exec(fp.read(), version) + exec(fp.read(), _version) -mtg_version = version["__version__"] +version = _version["__version__"] setup_kwds = dict( name='openalea.mtg', - version=mtg_version, + version=version, description=short_descr, long_description=readme + '\n\n' + history, author="Christophe Pradal", author_email="christophe pradal __at__ cirad fr", url='http://github.com/openalea/mtg', - license='cecill-c', + license='CeCILL-C', + keywords=['OpenAlea', 'MTG', 'Plant Architecture', 'Tree Graph'], zip_safe=False, packages=find_namespace_packages(where='src', include=['openalea', 'openalea.*']), package_dir={'': 'src'}, entry_points={}, - keywords='', ) # #} # change setup_kwds below before the next pkglts tag diff --git a/src/openalea/mtg/version.py b/src/openalea/mtg/version.py index b6478c7..15d5f2e 100644 --- a/src/openalea/mtg/version.py +++ b/src/openalea/mtg/version.py @@ -4,10 +4,10 @@ major = 2 """(int) Version major component.""" -minor = 1 +minor = 2 """(int) Version minor component.""" -post = 2 +post = 0 """(int) Version post or bugfix component.""" __version__ = ".".join([str(s) for s in (major, minor, post)])