Skip to content

Commit

Permalink
Merge pull request #33 from openalea/namespaces
Browse files Browse the repository at this point in the history
Update namespace
  • Loading branch information
pradal authored Jan 22, 2024
2 parents 64dfa27 + 7eaf797 commit 6c1ac85
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
16 changes: 8 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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_packages('src'),
packages=find_namespace_packages(where='src', include=['openalea', 'openalea.*']),
package_dir={'': 'src'},
entry_points={},
keywords='',
)
# #}
# change setup_kwds below before the next pkglts tag
Expand Down
4 changes: 0 additions & 4 deletions src/openalea/__init__.py

This file was deleted.

4 changes: 2 additions & 2 deletions src/openalea/mtg/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)])
Expand Down

0 comments on commit 6c1ac85

Please sign in to comment.