From bc283d69ef0b3deeb7788257372fe9751a7b034d Mon Sep 17 00:00:00 2001 From: Andre Merzky Date: Wed, 8 May 2024 10:19:27 +0200 Subject: [PATCH] missed some stuff... --- setup.py | 11 ++++++----- src/radical/entk/__init__.py | 24 ++++++++++++++++++++---- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 7f7f360b..b2e00d28 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ # ------------------------------------------------------------------------------ # -base = 'utils' +base = 'entk' name = 'radical.%s' % base mod_root = 'src/radical/%s/' % base @@ -29,11 +29,12 @@ keywords = ['radical', 'cybertools', 'utilities', 'ensemble', 'workflow'] share = 'share/%s' % name -data = [('%s/examples' % share, glob('examples/*' )), - ('%s/examples/user_guide/' % share, glob('examples/user_guide/*')), +data = [('%s/examples/advanced/' % share, glob('examples/advanced/*' )), + ('%s/examples/analytics/' % share, glob('examples/analytics/*' )), + ('%s/examples/misc/' % share, glob('examples/misc/*' )), ('%s/examples/simple/' % share, glob('examples/simple/*' )), - ('%s/examples/advanced/' % share, glob('examples/advanced/*' )), - ('%s/examples/analytics/' % share, glob('examples/analytics/*' )) + ('%s/examples/tutorial/' % share, glob('examples/tutorial/*' )), + ('%s/examples/user_guide/' % share, glob('examples/user_guide/*')), ] diff --git a/src/radical/entk/__init__.py b/src/radical/entk/__init__.py index 7ef16cc2..70ad0e97 100644 --- a/src/radical/entk/__init__.py +++ b/src/radical/entk/__init__.py @@ -1,4 +1,17 @@ +__copyright__ = "Copyright 2013-2024, http://radical.rutgers.edu" +__license__ = "MIT" + + +# ------------------------------------------------------------------------------ +# we *first* import radical.utils, so that the monkeypatching of the logger has +# a chance to kick in before the logging module is pulled by any other 3rd party +# module, and also to monkeypatch `os.fork()` for the `atfork` functionality +# +import os as _os +import radical.utils as _ru + + # ------------------------------------------------------------------------------ # from .appman import AppManager @@ -11,11 +24,14 @@ # ------------------------------------------------------------------------------ # -import os as _os -import radical.utils as _ru +# get version info +# +_mod_root = _os.path.dirname (__file__) -version, version_detail, version_base, version_branch, sdist_name, sdist_path =\ - _ru.get_version(_os.path.dirname(__file__)) +version_short, version_base, version_branch, version_tag, version_detail \ + = _ru.get_version(_mod_root) +version = version_short +__version__ = version_detail # ------------------------------------------------------------------------------