Merge branch 'bugfix/fixPyPiUploadDeprecations' into 'master'

fix some issues with deprecations for pypi packaging

See merge request !1503

CHANGELOG.md

@@ -48,6 +48,12 @@ SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
 
 - Deprecate the utility `integerSequenceEntry` in favour of the shorter `get` from `integersequence.hh`.
 
+## Python: Changelog
+
+- the `sdist` tar ball name should not use `-` (see PEP 625) so use `_` instead
+  `pip install dune-common` will still work as expected but `pip list` will
+  now show `dune_common` so the output of `pip list` is parsed anywhere
+  this is a breaking change.
 
 # Release 2.10
 

bin/dunepackaging.py

@@ -12,7 +12,6 @@ except ImportError:
 import sys, os, io, getopt, re, shutil
 import importlib, subprocess
 import email.utils
-import pkg_resources
 from datetime import date
 
 # make sure that 'metadata' is taken from the current `dune-common` folder
@@ -154,9 +153,8 @@ def main(argv):
         subprocess.call(remove)
 
         # check if we have scikit-build
-        import pkg_resources
-        installed = {pkg.key for pkg in pkg_resources.working_set}
-        if not 'scikit-build' in installed:
+        import importlib
+        if importlib.util.find_spec("skbuild") is None:
             print("Please install the pip package 'scikit-build' to build the source distribution.")
             sys.exit(2)
 
@@ -184,9 +182,8 @@ def main(argv):
 
         if not onlysdist:
             # check if we have twine
-            import pkg_resources
-            installed = {pkg.key for pkg in pkg_resources.working_set}
-            if not 'twine' in installed:
+            import importlib
+            if importlib.util.find_spec("twine") is None:
                 print("Please install the pip package 'twine' to upload the source distribution.")
                 sys.exit(2)
 

python/dune/packagemetadata.py

@@ -430,8 +430,9 @@ def metaData(version=None, dependencyCheck=True):
             long_description = 'No long description available for this package'
             print("Warning: no README[.md] file found so providing a default 'long_description' for this package")
 
+    # sdist name should not use '-' (see PEP 625) so use '_' instead
     setupParams = {
-        "name": data.name,
+        "name": data.name.replace("-","_"),
         "version": data.version,
         "author": data.author,
         "author_email": data.author_email,