Merge branch 'master' into jbrill-msvc-detect

Author: jcbrill

CHANGES.txt

@@ -70,6 +70,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From Thaddeus Crews:
     - GetSConsVersion() to grab the latest SCons version without needing to
       access SCons internals.
+    - Migrate setup.cfg logic to pyproject.toml; remove setup.cfg.
 
   From Raymond Li:
     - Fix issue #3935: OSErrors are now no longer hidden during execution of
@@ -129,6 +130,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       tweaked the Util package doc build so it's structured more like the
       other packages (a missed part of the transition when it was split).
     - Updated manpage description of Command "builder" and function.
+    - Framework for scons-time tests adjusted so a path with a long username
+      Windows has squashed doesn't get re-expanded. Fixes a problem seen
+      on GitHub Windows runner which uses a name "runneradmin".
 
 
 RELEASE 4.7.0 -  Sun, 17 Mar 2024 17:22:20 -0700

RELEASE.txt

@@ -114,7 +114,8 @@ IMPROVEMENTS
 PACKAGING
 ---------
 
-- List changes in the way SCons is packaged and/or released
+- setup.cfg logic now handled via pyproject.toml; consequently, setup.cfg
+  was removed.
 
 
 DOCUMENTATION

SConstruct

@@ -205,7 +205,7 @@ wheel = env.Command(
         '$DISTDIR/SCons-${VERSION}-py3-none-any.whl',
         '$DISTDIR/SCons-${VERSION}.tar.gz',
     ],
-    source=['setup.cfg', 'setup.py', 'SCons/__init__.py'] + man_pages,
+    source=['pyproject.toml', 'setup.py', 'SCons/__init__.py'] + man_pages,
     action='$PYTHON -m build --outdir $DISTDIR',
 )
 env.Alias("wheel", wheel[0])
@@ -215,7 +215,7 @@ env.Alias("tar-gz", wheel[1])
 # and it deletes its isolated env so we can't just zip that one up.
 zip_file = env.Command(
     target='$DISTDIR/SCons-${VERSION}.zip',
-    source=['setup.cfg', 'setup.py', 'SCons/__init__.py'] + man_pages,
+    source=['pyproject.toml', 'setup.py', 'SCons/__init__.py'] + man_pages,
     action='$PYTHON setup.py sdist --format=zip',
 )
 env.Alias("zip", zip_file)

pyproject.toml

@@ -2,12 +2,75 @@
 build-backend = "setuptools.build_meta"
 requires = ["setuptools"]
 
+[project]
+name = "SCons"
+description = "Open Source next-generation build tool."
+requires-python = ">=3.6"
+license = { text = "MIT" }
+readme = { file = "README-package.rst", content-type = "text/x-rst" }
+authors = [{ name = "William Deegan", email = "[email protected]" }]
+dynamic = ["version"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Topic :: Software Development :: Build Tools",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: Unix",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+]
+
+[project.urls]
+Homepage = "https://www.scons.org/"
+Documentation = "https://scons.org/documentation.html"
+Twitter = "https://twitter.com/SConsProject"
+GitHub = "https://github.com/SCons/scons"
+Bug-Tracker = "https://github.com/SCons/scons/issues"
+Discord = "https://discord.gg/pejaFYrD9n"
+"Mailing lists" = "https://scons.org/lists.html"
+
+[project.scripts]
+scons = "SCons.Script.Main:main"
+sconsign = "SCons.Utilities.sconsign:main"
+scons-configure-cache = "SCons.Utilities.ConfigureCache:main"
+
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+license-files = ["LICENSE"]
+
+[tool.setuptools.packages.find]
+exclude = ["template"]
+namespaces = false
+
+[tool.setuptools.package-data]
+"*" = ["*.txt", "*.rst", "*.1"]
+"scons.tool.docbook" = ["*.*"]
+
+[tool.distutils.sdist]
+dist-dir = "build/dist"
+
+[tool.distutils.bdist_wheel]
+dist-dir = "build/dist"
+
 # for black and mypy, set the lowest Python version supported
 [tool.black]
 quiet = true
 target-version = ['py36']
 skip-string-normalization = true
 
-[mypy]
-python_version = 3.6
-
+[tool.mypy]
+python_version = "3.6"

setup.cfg

@@ -40,6 +40,7 @@
 
 from TestCommon import *
 from TestCommon import __all__
+from TestCmd import IS_WINDOWS
 # some of the scons_time tests may need regex-based matching:
 from TestSCons import search_re, search_re_in_list
 
@@ -236,7 +237,11 @@ def tempdir_re(self, *args):
         except AttributeError:
             pass
         else:
-            tempdir = realpath(tempdir)
+            # Don't realpath on Windows, tempdir could contain 8+3 path
+            # E.g. username on GitHub runner is "runneradmin" -> "RUNNER~1"
+            # We don't want to convert that back!
+            if not IS_WINDOWS:
+                tempdir = realpath(tempdir)
 
         args = (tempdir, 'scons-time-',) + args
         x = os.path.join(*args)

testing/framework/TestSCons_time.py

@@ -33,8 +33,6 @@ test/packaging/msi/package.py
 test/packaging/tar/xz_packaging.py
 test/scons-time/run/config/python.py
 test/scons-time/run/option/python.py
-test/scons-time/run/option/quiet.py
-test/scons-time/run/option/verbose.py
 test/sconsign/script/no-SConsignFile.py
 test/sconsign/script/SConsignFile.py
 test/sconsign/script/Signatures.py