From f21b2dd4af2874401eac65f24ef5142216e0a284 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 16 Jan 2022 00:51:12 +0000 Subject: Update ActionTests.py to work with change in function signature for 3.10.1+ (it changed from 3.10.0) --- SCons/ActionTests.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/SCons/ActionTests.py b/SCons/ActionTests.py index dd816bb..29ed4a7 100644 --- a/SCons/ActionTests.py +++ b/SCons/ActionTests.py @@ -2246,16 +2246,17 @@ class ObjectContentsTestCase(unittest.TestCase): # Since the python bytecode has per version differences, we need different expected results per version expected = { - (3, 5): bytearray(b'3, 3, 0, 0,(),(),(|\x00\x00S),(),()'), - (3, 6): bytearray(b'3, 3, 0, 0,(),(),(|\x00S\x00),(),()'), - (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): bytearray(b'3, 3, 0, 0,(N.),(),(|\x00S\x00),(),()'), + (3, 5): (bytearray(b'3, 3, 0, 0,(),(),(|\x00\x00S),(),()')), + (3, 6): (bytearray(b'3, 3, 0, 0,(),(),(|\x00S\x00),(),()')), + (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): (bytearray(b'3, 3, 0, 0,(N.),(),(|\x00S\x00),(),()'), + bytearray(b'3, 3, 0, 0,(),(),(|\x00S\x00),(),()')) # 3.10.1, 3.10.2 } c = SCons.Action._function_contents(func1) - assert c == expected[sys.version_info[:2]], "Got\n" + repr(c) + "\nExpected \n" + "\n" + repr( + assert c in expected[sys.version_info[:2]], "Got\n" + repr(c) + "\nExpected \n" + "\n" + repr( expected[sys.version_info[:2]]) def test_object_contents(self): -- cgit v0.12 From 182c38f4cb81650775eb0643033efc3432567266 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 16 Jan 2022 00:55:02 +0000 Subject: updates for CHANGES.txt and RELEASE.txt --- CHANGES.txt | 4 ++++ RELEASE.txt | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index e544d13..df23c14 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,6 +16,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From William Deegan: - Fix check for unsupported Python version. It was broken. Also now the error message will include what is the minimum supported version of Python + - Fix ActionTests to work with python 3.10.1 (and higher) + NOTE: If you build with Python 3.10.0 and then rebuild with 3.10.1 (or higher), you may + see unexpected rebuilds. This is due to Python internals changing which changed + the signature of a Python Action Function. From Daniel Moody: - Add cache-debug messages for push failures. diff --git a/RELEASE.txt b/RELEASE.txt index 7a84d0f..ff3c82b 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -6,6 +6,11 @@ on the SCons download page: Here is a summary of the changes since 4.3.1: +NOTE: If you build with Python 3.10.0 and then rebuild with 3.10.1 (or higher), you may + see unexpected rebuilds. This is due to Python internals changing which changed + the signature of a Python Action Function. + + NEW FUNCTIONALITY ----------------- @@ -19,9 +24,6 @@ DEPRECATED FUNCTIONALITY CHANGED/ENHANCED EXISTING FUNCTIONALITY --------------------------------------- -- List modifications to existing features, where the previous behavior - wouldn't actually be considered a bug - - On Windows, %AllUsersProfile%\scons\site_scons is now the default "system" location for a site_scons. %AllUsersProfile%\Application Data\scons\site_scons will continue to work. There does not seem to be any convention to use -- cgit v0.12