merge from devel

radical-cybertools · Apr 15, 2024 · 9b49976 · 9b49976
2 parents 1746c02 + 80ab744
commit 9b49976
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,12 @@
     https://github.com/radical-cybertools/radical.entk/ \
             issues?q=is%3Aissue+is%3Aopen+
 
+1.50.0 Release                                                        2024-04-15
+--------------------------------------------------------------------------------
+
+  - fix for setuptools upgrade
+
+
 1.48.0 Release                                                        2024-02-24
 --------------------------------------------------------------------------------
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.48.0
+1.51.0
diff --git a/setup.py b/setup.py
@@ -137,6 +137,10 @@ def get_version(_mod_root):
       # _sdist_name = _sdist_name.replace('#', '-')
       # _sdist_name = _sdist_name.replace('_', '-')
 
+        # setuptools 69.5 does changes naming scheme
+        if not os.path.isfile('%s/%s' % (_path, _sdist_name)):
+            _sdist_name = '%s-%s.tar.gz' % (name.replace('.', '_'), _version_base)
+
         if '--record'    in sys.argv or \
            'bdist_egg'   in sys.argv or \
            'bdist_wheel' in sys.argv    :
@@ -205,7 +209,7 @@ def run(self):
 #
 setup_args = {
     'name'               : name,
-    'namespace_packages' : ['radical'],
+  # 'namespace_packages' : ['radical'],
     'version'            : version,
     'description'        : "Radical Ensemble Toolkit.",
     'author'             : 'RADICAL Group at Rutgers University',