From 8807cc0ad833655cd1ca29da86e1037f597436a5 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 2 Mar 2025 13:12:34 -0800 Subject: [PATCH] Update NEXT_RELEASE to 4.9.0 --- SCons/Environment.py | 6 +++--- SCons/Environment.xml | 4 ++-- SCons/EnvironmentTests.py | 8 ++++---- SCons/SConf.py | 4 ++-- SCons/Scanner/C.py | 2 +- SCons/Script/SConsOptions.py | 2 +- SCons/Script/SConscript.py | 2 +- SCons/Script/__init__.py | 2 +- SCons/Variables/PackageVariable.py | 2 +- SCons/Variables/__init__.py | 2 +- doc/generated/builders.gen | 2 +- doc/generated/functions.gen | 4 ++-- doc/man/scons.xml | 8 ++++---- template/RELEASE.txt | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/SCons/Environment.py b/SCons/Environment.py index 468da237d..c18808db5 100644 --- a/SCons/Environment.py +++ b/SCons/Environment.py @@ -1731,7 +1731,7 @@ def Dictionary(self, *args: str, as_dict: bool = False): Raises: KeyError: if any of *args* is not in the construction environment. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 Added the *as_dict* keyword arg to specify always returning a dict. """ if not args: @@ -1763,7 +1763,7 @@ def Dump(self, *key: str, format: str = 'pretty') -> str: Raises: ValueError: *format* is not a recognized serialization format. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 *key* is no longer limited to a single construction variable name. If *key* is supplied, a formatted dictionary is generated like the no-arg case - previously a single *key* displayed just the value. @@ -2746,7 +2746,7 @@ def Dictionary(self, *args, as_dict: bool = False): Raises: KeyError: if any of *args* is not in the construction environment. - .. versionchanged: NEXT_RELEASE + .. versionchanged: 4.9.0 Added the *as_dict* keyword arg to always return a dict. """ d = {} diff --git a/SCons/Environment.xml b/SCons/Environment.xml index f24c2af3e..e59ab02f7 100644 --- a/SCons/Environment.xml +++ b/SCons/Environment.xml @@ -1656,7 +1656,7 @@ can be verified. -Changed in NEXT_RELEASE: +Changed in 4.9.0: as_dict added. @@ -1745,7 +1745,7 @@ the JSON equivalent of a &Python; dict.. -Changed in NEXT_RELEASE: +Changed in 4.9.0: More than one key can be specified. The returned string always looks like a dict (or equivalent in other formats); diff --git a/SCons/EnvironmentTests.py b/SCons/EnvironmentTests.py index 22b907470..9f93fd2e9 100644 --- a/SCons/EnvironmentTests.py +++ b/SCons/EnvironmentTests.py @@ -2137,7 +2137,7 @@ def test_Dictionary(self) -> None: xxx, zzz = env.Dictionary('XXX', 'ZZZ') assert xxx == 'x' assert zzz == 'z' - # added in NEXT_RELEASE: as_dict flag + # added in 4.9.0: as_dict flag with self.subTest(): expect = {'XXX': 'x'} self.assertEqual(env.Dictionary('XXX', as_dict=True), expect) @@ -3211,7 +3211,7 @@ def test_Dump(self) -> None: """Test the Dump() method""" env = self.TestEnvironment(FOO='foo', FOOFLAGS=CLVar('--bar --baz')) - # changed in NEXT_RELEASE: single arg now displays as a dict, + # changed in 4.9.0: single arg now displays as a dict, # not a bare value; more than one arg is allowed. with self.subTest(): # one-arg version self.assertEqual(env.Dump('FOO'), "{'FOO': 'foo'}") @@ -3851,7 +3851,7 @@ def test___delitem__(self) -> None: """Test deleting variables from an OverrideEnvironment""" env, env2, env3 = self.envs - # changed in NEXT_RELEASE: delete does not cascade to underlying envs + # changed in 4.9.0: delete does not cascade to underlying envs # XXX is in all three, del from env3 should affect only it del env3['XXX'] with self.subTest(): @@ -3947,7 +3947,7 @@ def test_Dictionary(self) -> None: # test deletion in top override del env3['XXX'] self.assertRaises(KeyError, env3.Dictionary, 'XXX') - # changed in NEXT_RELEASE: *not* deleted from underlying envs + # changed in 4.9.0: *not* deleted from underlying envs assert 'XXX' in env2.Dictionary() assert 'XXX' in env.Dictionary() diff --git a/SCons/SConf.py b/SCons/SConf.py index 36bb9142f..7d7874bdd 100644 --- a/SCons/SConf.py +++ b/SCons/SConf.py @@ -1108,7 +1108,7 @@ def CheckLib(context, library = None, symbol: str = "main", Note that library may also be None to test whether the given symbol compiles without flags. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 Added the *extra_libs* keyword parameter. The actual implementation is in :func:`SCons.Conftest.CheckLib` which already accepted this parameter, so this is only exposing existing functionality. @@ -1140,7 +1140,7 @@ def CheckLibWithHeader(context, libs, header, language, As in :func:`CheckLib`, we support library=None, to test if the call compiles without extra link flags. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 Added the *extra_libs* keyword parameter. The actual implementation is in :func:`SCons.Conftest.CheckLib` which already accepted this parameter, so this is only exposing existing functionality. diff --git a/SCons/Scanner/C.py b/SCons/Scanner/C.py index 1d7e101e4..bfd897dcb 100644 --- a/SCons/Scanner/C.py +++ b/SCons/Scanner/C.py @@ -89,7 +89,7 @@ def dictify_CPPDEFINES(env, replace: bool = False) -> dict: Args: replace: if true, simulate macro replacement - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 Simple macro replacement added, and *replace* arg to enable it. """ def _replace(mapping: Dict) -> Dict: diff --git a/SCons/Script/SConsOptions.py b/SCons/Script/SConsOptions.py index ef27b7066..2690a086c 100644 --- a/SCons/Script/SConsOptions.py +++ b/SCons/Script/SConsOptions.py @@ -242,7 +242,7 @@ class SConsOption(optparse.Option): syntax from :mod:`argparse`, and is added to the ``CHECK_METHODS`` list. Overridden :meth:`convert_value` supports this usage. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 The *settable* attribute is added to ``ATTRS``, allowing it to be set in the option. A parameter to mark the option settable was added in 4.8.0, but was not initially made part of the option object itself. diff --git a/SCons/Script/SConscript.py b/SCons/Script/SConscript.py index fa6fce775..f98cf3b21 100644 --- a/SCons/Script/SConscript.py +++ b/SCons/Script/SConscript.py @@ -552,7 +552,7 @@ def Help(self, text, append: bool = False, local_only: bool = False) -> None: .. versionchanged:: 4.6.0 The *keep_local* parameter was added. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 The *keep_local* parameter was renamed *local_only* to match manpage """ text = self.subst(text, raw=1) diff --git a/SCons/Script/__init__.py b/SCons/Script/__init__.py index 0243a9cf6..cf6c9de31 100644 --- a/SCons/Script/__init__.py +++ b/SCons/Script/__init__.py @@ -267,7 +267,7 @@ def HelpFunction(text, append: bool = False, local_only: bool = False) -> None: .. versionchanged:: 4.6.0 The *keep_local* parameter was added. - .. versionchanged:: NEXT_RELEASE + .. versionchanged:: 4.9.0 The *keep_local* parameter was renamed *local_only* to match manpage """ global help_text diff --git a/SCons/Variables/PackageVariable.py b/SCons/Variables/PackageVariable.py index 2ecedfe77..c615ac424 100644 --- a/SCons/Variables/PackageVariable.py +++ b/SCons/Variables/PackageVariable.py @@ -71,7 +71,7 @@ def _converter(val: str | bool, default: str) -> str | bool: *default* unless *default* is an enabling or disabling string, in which case ignore *default* and return ``True``. - .. versionchanged: NEXT_RELEASE + .. versionchanged: 4.9.0 Now returns the default in case of a truthy value, matching what the public documentation always claimed, except if the default looks like one of the true/false strings. diff --git a/SCons/Variables/__init__.py b/SCons/Variables/__init__.py index 2ac95d067..ca1843215 100644 --- a/SCons/Variables/__init__.py +++ b/SCons/Variables/__init__.py @@ -95,7 +95,7 @@ class Variables: .. deprecated:: 4.8.0 *is_global* is deprecated. - .. versionadded:: NEXT_RELEASE + .. versionadded:: 4.9.0 The :attr:`defaulted` attribute now lists those variables which were filled in from default values. """ diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen index cfcb36176..cb04e7ccd 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -479,7 +479,7 @@ a "live" location in the system. -See also &FindInstalledFiles;. +See also &f-link-FindInstalledFiles;. For more thoughts on installation, see the User Guide (particularly the section on Command-Line Targets and the chapters on Installing Files and on Alias Targets). diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen index b5fcfcc7a..26f21c7f6 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -1644,7 +1644,7 @@ can be verified. -Changed in NEXT_RELEASE: +Changed in 4.9.0: as_dict added. @@ -1726,7 +1726,7 @@ the JSON equivalent of a &Python; dict.. -Changed in NEXT_RELEASE: +Changed in 4.9.0: More than one key can be specified. The returned string always looks like a dict (or equivalent in other formats); diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 5a05466ba..4d3c7d46e 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -105,7 +105,7 @@ The CPython project retired 3.6 in Sept 2021: . -Changed in version NEXT_RELEASE: +Changed in version 4.9.0: support for &Python; 3.6 is removed. @@ -4221,7 +4221,7 @@ at least one should be supplied. parameters. -Changed in version NEXT_RELEASE: added the +Changed in version 4.9.0: added the extra_libs parameter. @@ -4286,7 +4286,7 @@ it will not be added again. The default is False. parameters. -Changed in version NEXT_RELEASE: added the +Changed in version 4.9.0: added the extra_libs parameter. @@ -5261,7 +5261,7 @@ This is the same information that is returned by the -Added in NEXT_RELEASE: +Added in 4.9.0: the defaulted attribute. diff --git a/template/RELEASE.txt b/template/RELEASE.txt index 77ce83b32..128daa16f 100755 --- a/template/RELEASE.txt +++ b/template/RELEASE.txt @@ -6,7 +6,7 @@ Past official release announcements appear at: ================================================================== -A new SCons release, NEXT_RELEASE, is now available on the SCons download page: +A new SCons release, 4.9.0, is now available on the SCons download page: https://scons.org/pages/download.html