Merge branch 'master' into maint/variables-export

Author: bdbaddog

CHANGES.txt

@@ -35,6 +35,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       `from SCons.Variables import *` which expected the variable *types*
       to be avaiable. While we never advertised this usage, there's no
       real reason it shouldn't keep working - add to `__all__`.
+    - Switch SCons build to use setuptools' supported version fetcher from
+      the old homegrown one.
 
 
 RELEASE 4.8.0 -  Sun, 07 Jul 2024 17:22:20 -0700

pyproject.toml

@@ -52,6 +52,9 @@ zip-safe = false
 include-package-data = true
 license-files = ["LICENSE"]
 
+[tool.setuptools.dynamic]
+version = {attr = "SCons.__version__"}
+
 [tool.setuptools.packages.find]
 exclude = ["template"]
 namespaces = false

setup.py

@@ -14,24 +14,16 @@ def read(rel_path):
         return fp.read()
 
 
-def get_version(rel_path):
-    for line in read(rel_path).splitlines():
-        if line.startswith('__version__'):
-            delim = '"' if '"' in line else "'"
-            return line.split(delim)[1]
-    else:
-        raise RuntimeError("Unable to find version string.")
-
-
 exclude = ['*Tests']
 
 
 class build_py(build_py_orig):
 
     def find_package_modules(self, package, package_dir):
-        """
-        Custom module to find package modules.
-        It will strip out any modules which match the glob patters in exclude above
+        """Custom module to find package modules.
+
+        Will strip out any modules which match the glob patters in
+        *exclude* above
         """
         modules = super().find_package_modules(package, package_dir)
         return [(pkg, mod, file, ) for (pkg, mod, file, ) in modules
@@ -42,5 +34,4 @@ def find_package_modules(self, package, package_dir):
     cmdclass={
         'build_py': build_py,
     },
-    version=get_version('SCons/__init__.py'),
-)
+)