Merge branch 'master' into NinjaAlwaysBuild

Author: bdbaddog

AGENTS.md

@@ -94,6 +94,6 @@ python -m mypy SCons/               # type check
 - Git commits signed off (`git commit -s`). Add `Assisted-by:` to message for AI-generated changes.
 - Version in `SCons/__init__.py` (`__version__`) - automatically generated, do not edit.
 - CI: GitHub Actions (`runtest.yml` - test suite; `scons-package.yml` — packaging), AppVeyor (Windows, legacy).
-- Python >= 3.7 required.
+- Python >= 3.9 required.
 - Config log for `Configure()` lives at `config.log` in the build dir.
 - `.sconsign.dblite` persists across builds; deleting build dirs from disk doesn't clear sconsign entries.

CHANGES.txt

@@ -8,10 +8,17 @@ NOTE: The 4.0.0 release of SCons dropped Python 2.7 support. Use 3.1.2 if
   Python 2.7 support is required (but note old SCons releases are unsupported).
 NOTE: Since SCons 4.3.0, Python 3.6.0 or above is required.
 NOTE: Since SCons 4.9.0, Python 3.7.0 or above is required.
-NOTE: The last release to support Python 3.7 or Python 3.8 is 4.11.0.
+NOTE: The last release to support Python 3.7 or Python 3.8 is 4.11.1
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
+  From Thaddeus Crews:
+    - ty: Initial support setup within `pyproject.toml`.
+    - Removed Python 3.7 & 3.8 support.
+
+
+RELEASE 4.11.1 - Mon, 26 Aug 2026 21:16:00 -0700
+
   From Mats Wichmann:
     - Undo, for now, the 4.11.0 change (from PR 4875) to read a
       saved-Variables file using a File node. There were unanticipated

README-SF.rst

@@ -47,7 +47,7 @@ version at the SCons download page:
 Execution Requirements
 ======================
 
-Running SCons requires Python 3.7 or higher. There should be no other
+Running SCons requires Python 3.9 or higher. There should be no other
 dependencies or requirements to run standard SCons.
 
 The last release to support Python 3.7 or Python 3.8 is 4.11.0.
@@ -613,4 +613,3 @@ many contributors, including but not at all limited to:
 \... and many others.
 
 Copyright (c) 2001 - 2026 The SCons Foundation
-

README-local

@@ -43,7 +43,7 @@ scons-local package, or any SCons package, at the SCons download page:
 EXECUTION REQUIREMENTS
 ======================
 
-Running SCons requires Python 3.7 or higher. There should be no other
+Running SCons requires Python 3.9 or higher. There should be no other
 dependencies or requirements to run standard SCons.
 
 The last release to support Python 3.7 or Python 3.8 is 4.11.0.

README-package.rst

@@ -80,7 +80,7 @@ https://scons.org/documentation.html.
 Execution Requirements
 ======================
 
-Running SCons requires Python 3.7 or higher. There should be no other
+Running SCons requires Python 3.9 or higher. There should be no other
 dependencies or requirements to run standard SCons.
 
 The last release to support Python 3.7 or Python 3.8 is 4.11.0.
@@ -196,4 +196,3 @@ Check the SCons web site at https://scons.org
 
 
 Copyright (c) 2001 - 2026 The SCons Foundation
-

README.rst

@@ -83,7 +83,7 @@ is the latest version at the
 Execution Requirements
 ======================
 
-Running SCons requires Python 3.7 or higher. There should be no other
+Running SCons requires Python 3.9 or higher. There should be no other
 dependencies or requirements to run standard SCons.
 
 The last release to support Python 3.7 or Python 3.8 is 4.11.0.

RELEASE.txt

@@ -6,12 +6,12 @@ Past official release announcements appear at:
 
 ==================================================================
 
-A new SCons release, 4.11.0, is now available on the SCons download page:
+A new SCons release, NEXT_RELEASE, is now available on the SCons download page:
 
     https://scons.org/pages/download.html
 
 
-Here is a summary of the changes since 4.10.1:
+Here is a summary of the changes since PREVIOUS_RELEASE:
 
 NEW FUNCTIONALITY
 -----------------
@@ -23,6 +23,13 @@ DEPRECATED FUNCTIONALITY
 
 - List anything that's been deprecated since the last release
 
+REMOVED FUNCTIONALITY
+------------------------
+
+- List anything that's been outright removed since the last release
+
+- Removed Python 3.7 & 3.8 support.
+
 CHANGED/ENHANCED EXISTING FUNCTIONALITY
 ---------------------------------------
 
@@ -64,10 +71,12 @@ DOCUMENTATION
 DEVELOPMENT
 -----------
 
-- List visible changes in the way SCons is developed
+- List visible changes in the way SCons is 
+
+- ty: Initial support setup within `pyproject.toml`.
 
 Thanks to the following contributors listed below for their contributions to this release.
 ==========================================================================================
 .. code-block:: text
 
-    git shortlog --no-merges -ns 4.10.1..HEAD
+    git shortlog --no-merges -ns PREVIOUS_RELEASE..HEAD

ReleaseConfig

@@ -31,13 +31,13 @@
 # If the release type is not 'final', the patchlevel is set to the
 # release date.  This value is mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (4, 12, 0, 'a', 0)
+version_tuple = (4, 11, 2, 'a', 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
 # cause a warning to be issued (assuming it's not disabled).  These values are
 # mandatory and must be present in the configuration file.
-unsupported_python_version = (3, 7, 0)
+unsupported_python_version = (3, 9, 0)
 deprecated_python_version = (3, 9, 0)
 
 # If release_date is (yyyy, mm, dd, hh, mm, ss), that is used as the release

SCons/ActionTests.py

@@ -1553,8 +1553,6 @@ def LocalFunc() -> None:
 
         # Since the python bytecode has per version differences, we need different expected results per version
         func_matches = {
-            (3, 7): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
-            (3, 8): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 9): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 10): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
@@ -1735,8 +1733,6 @@ def LocalFunc() -> None:
             pass
 
         func_matches = {
-            (3, 7): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
-            (3, 8): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 9): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 10): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
@@ -1748,8 +1744,6 @@ def LocalFunc() -> None:
         }
 
         meth_matches = {
-            (3, 7): bytearray(b'1, 1, 0, 0,(),(),(d\x00S\x00),(),()'),
-            (3, 8): bytearray(b'1, 1, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 9): bytearray(b'1, 1, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 10): bytearray(b'1, 1, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'1, 1, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
@@ -1991,8 +1985,6 @@ def LocalFunc() -> None:
             pass
 
         func_matches = {
-            (3, 7): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
-            (3, 8): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 9): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 10): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
@@ -2055,8 +2047,6 @@ def LocalFunc() -> None:
             pass
 
         matches = {
-            (3, 7): b'd\x00S\x00',
-            (3, 8): b'd\x00S\x00',
             (3, 9): b'd\x00S\x00',
             (3, 10): b'd\x00S\x00',
             (3, 11): b'\x97\x00d\x00S\x00',
@@ -2259,8 +2249,6 @@ def func1(a, b, c):
         # we need different expected results per version
         # Note unlike the others, this result is a tuple, use assertIn
         expected = {
-            (3, 7): (bytearray(b"3, 3, 0, 0,(),(),(|\x00S\x00),(),()"),),
-            (3, 8): (bytearray(b"3, 3, 0, 0,(),(),(|\x00S\x00),(),()"),),
             (3, 9): (bytearray(b"3, 3, 0, 0,(),(),(|\x00S\x00),(),()"),),
             (3, 10): (  # 3.10.1, 3.10.2
                 bytearray(b"3, 3, 0, 0,(N.),(),(|\x00S\x00),(),()"),
@@ -2288,12 +2276,6 @@ def test_object_contents(self) -> None:
         # Since the python bytecode has per version differences,
         # we need different expected results per version
         expected = {
-            (3, 7): bytearray(
-                b"{TestClass:__main__}[[[(<class 'object'>, ()), [(<class '__main__.TestClass'>, (<class 'object'>,))]]]]{{1, 1, 0, 0,(a,b),(a,b),(d\x01|\x00_\x00d\x02|\x00_\x01d\x00S\x00),(),(),2, 2, 0, 0,(),(),(d\x00S\x00),(),()}}{{{a=a,b=b}}}"
-            ),
-            (3, 8): bytearray(
-                b"{TestClass:__main__}[[[(<class 'object'>, ()), [(<class '__main__.TestClass'>, (<class 'object'>,))]]]]{{1, 1, 0, 0,(a,b),(a,b),(d\x01|\x00_\x00d\x02|\x00_\x01d\x00S\x00),(),(),2, 2, 0, 0,(),(),(d\x00S\x00),(),()}}{{{a=a,b=b}}}"
-            ),
             (3, 9): bytearray(
                 b"{TestClass:__main__}[[[(<class 'object'>, ()), [(<class '__main__.TestClass'>, (<class 'object'>,))]]]]{{1, 1, 0, 0,(a,b),(a,b),(d\x01|\x00_\x00d\x02|\x00_\x01d\x00S\x00),(),(),2, 2, 0, 0,(),(),(d\x00S\x00),(),()}}{{{a=a,b=b}}}"
             ),
@@ -2326,12 +2308,6 @@ def test_code_contents(self) -> None:
 
         # Since the python bytecode has per version differences, we need different expected results per version
         expected = {
-            (3, 7): bytearray(
-                b"0, 0, 0, 0,(Hello, World!),(print),(e\x00d\x00\x83\x01\x01\x00d\x01S\x00)"
-            ),
-            (3, 8): bytearray(
-                b"0, 0, 0, 0,(Hello, World!),(print),(e\x00d\x00\x83\x01\x01\x00d\x01S\x00)"
-            ),
             (3, 9): bytearray(
                 b"0, 0, 0, 0,(Hello, World!),(print),(e\x00d\x00\x83\x01\x01\x00d\x01S\x00)"
             ),

SCons/CacheDir.py

@@ -210,44 +210,22 @@ def _mkdir_atomic(self, path: str) -> bool:
             return False
 
         try:
-            # TODO: Python 3.7. See comment below.
-            # tempdir = tempfile.TemporaryDirectory(dir=os.path.dirname(directory))
-            tempdir = tempfile.mkdtemp(dir=os.path.dirname(directory))
+            tempdir = tempfile.TemporaryDirectory(dir=os.path.dirname(directory))
         except OSError as e:
             msg = "Failed to create cache directory " + path
             raise SCons.Errors.SConsEnvironmentError(msg) from e
 
-        # TODO: Python 3.7: the context manager raises exception on cleanup
-        #    if the temporary was moved successfully (File Not Found).
-        #    Fixed in 3.8+. In the replacement below we manually clean up if
-        #    the move failed as mkdtemp() does not. TemporaryDirectory's
-        #    cleanup is more sophisitcated so prefer when we can use it.
-        # self._add_config(tempdir.name)
-        # with tempdir:
-        #     try:
-        #         os.replace(tempdir.name, directory)
-        #         return True
-        #     except OSError as e:
-        #         # did someone else get there first?
-        #         if os.path.isdir(directory):
-        #             return False  # context manager cleans up
-        #         msg = "Failed to create cache directory " + path
-        #         raise SCons.Errors.SConsEnvironmentError(msg) from e
-
-        self._add_config(tempdir)
-        try:
-            os.replace(tempdir, directory)
-            return True
-        except OSError as e:
-            # did someone else get there first? attempt cleanup.
-            if os.path.isdir(directory):
-                try:
-                    shutil.rmtree(tempdir)
-                except Exception:  # we tried, don't worry about it
-                    pass
-                return False
-            msg = "Failed to create cache directory " + path
-            raise SCons.Errors.SConsEnvironmentError(msg) from e
+        self._add_config(tempdir.name)
+        with tempdir:
+            try:
+                os.replace(tempdir.name, directory)
+                return True
+            except OSError as e:
+                # did someone else get there first?
+                if os.path.isdir(directory):
+                    return False  # context manager cleans up
+                msg = "Failed to create cache directory " + path
+                raise SCons.Errors.SConsEnvironmentError(msg) from e
 
     def _readconfig(self, path: str) -> None:
         """Read the cache config from *path*.