diff options
author | William Deegan <bill@baddogconsulting.com> | 2025-03-02 21:12:34 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2025-03-02 21:12:34 (GMT) |
commit | 8807cc0ad833655cd1ca29da86e1037f597436a5 (patch) | |
tree | 56a12ae8c53df2c8932d5759c51b36b275fdeb9e | |
parent | c0572bdb48fba21a8518cc171836600e97ec42e1 (diff) | |
download | SCons-8807cc0ad833655cd1ca29da86e1037f597436a5.zip SCons-8807cc0ad833655cd1ca29da86e1037f597436a5.tar.gz SCons-8807cc0ad833655cd1ca29da86e1037f597436a5.tar.bz2 |
Update NEXT_RELEASE to 4.9.0
-rw-r--r-- | SCons/Environment.py | 6 | ||||
-rw-r--r-- | SCons/Environment.xml | 4 | ||||
-rw-r--r-- | SCons/EnvironmentTests.py | 8 | ||||
-rw-r--r-- | SCons/SConf.py | 4 | ||||
-rw-r--r-- | SCons/Scanner/C.py | 2 | ||||
-rw-r--r-- | SCons/Script/SConsOptions.py | 2 | ||||
-rw-r--r-- | SCons/Script/SConscript.py | 2 | ||||
-rw-r--r-- | SCons/Script/__init__.py | 2 | ||||
-rw-r--r-- | SCons/Variables/PackageVariable.py | 2 | ||||
-rw-r--r-- | SCons/Variables/__init__.py | 2 | ||||
-rw-r--r-- | doc/generated/builders.gen | 2 | ||||
-rw-r--r-- | doc/generated/functions.gen | 4 | ||||
-rw-r--r-- | doc/man/scons.xml | 8 | ||||
-rwxr-xr-x | template/RELEASE.txt | 2 |
14 files changed, 25 insertions, 25 deletions
diff --git a/SCons/Environment.py b/SCons/Environment.py index 468da23..c18808d 100644 --- a/SCons/Environment.py +++ b/SCons/Environment.py @@ -1731,7 +1731,7 @@ class Base(SubstitutionEnvironment): 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 @@ class Base(SubstitutionEnvironment): 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 @@ class OverrideEnvironment(Base): 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 f24c2af..e59ab02 100644 --- a/SCons/Environment.xml +++ b/SCons/Environment.xml @@ -1656,7 +1656,7 @@ can be verified. </para></note> <para> -<emphasis>Changed in NEXT_RELEASE</emphasis>: +<emphasis>Changed in 4.9.0</emphasis>: <parameter>as_dict</parameter> added. </para> @@ -1745,7 +1745,7 @@ the JSON equivalent of a &Python; <type>dict</type>.. </variablelist> <para> -<emphasis>Changed in NEXT_RELEASE</emphasis>: +<emphasis>Changed in 4.9.0</emphasis>: More than one <parameter>key</parameter> can be specified. The returned string always looks like a <type>dict</type> (or equivalent in other formats); diff --git a/SCons/EnvironmentTests.py b/SCons/EnvironmentTests.py index 22b9074..9f93fd2 100644 --- a/SCons/EnvironmentTests.py +++ b/SCons/EnvironmentTests.py @@ -2137,7 +2137,7 @@ def generate(env): 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 generate(env): """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 @@ class OverrideEnvironmentTestCase(unittest.TestCase,TestEnvironmentFixture): """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 @@ class OverrideEnvironmentTestCase(unittest.TestCase,TestEnvironmentFixture): # 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 36bb914..7d7874b 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 1d7e101..bfd897d 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 ef27b70..2690a08 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 fa6fce7..f98cf3b 100644 --- a/SCons/Script/SConscript.py +++ b/SCons/Script/SConscript.py @@ -552,7 +552,7 @@ class SConsEnvironment(SCons.Environment.Base): .. 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 0243a9c..cf6c9de 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 2ecedfe..c615ac4 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 2ac95d0..ca18432 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 cfcb361..cb04e7c 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -479,7 +479,7 @@ a "live" location in the system. </para> <para> -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 b5fcfcc..26f21c7 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -1644,7 +1644,7 @@ can be verified. </para></note> <para> -<emphasis>Changed in NEXT_RELEASE</emphasis>: +<emphasis>Changed in 4.9.0</emphasis>: <parameter>as_dict</parameter> added. </para> @@ -1726,7 +1726,7 @@ the JSON equivalent of a &Python; <type>dict</type>.. </variablelist> <para> -<emphasis>Changed in NEXT_RELEASE</emphasis>: +<emphasis>Changed in 4.9.0</emphasis>: More than one <parameter>key</parameter> can be specified. The returned string always looks like a <type>dict</type> (or equivalent in other formats); diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 5a05466..4d3c7d4 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -105,7 +105,7 @@ The CPython project retired 3.6 in Sept 2021: <ulink url="https://peps.python.org/pep-0494"/>. </para> <para> -<emphasis>Changed in version NEXT_RELEASE:</emphasis> +<emphasis>Changed in version 4.9.0:</emphasis> support for &Python; 3.6 is removed. </para> @@ -4221,7 +4221,7 @@ at least one should be supplied. parameters.</emphasis> </para> <para> -<emphasis>Changed in version NEXT_RELEASE: added the +<emphasis>Changed in version 4.9.0: added the <parameter>extra_libs</parameter> parameter.</emphasis> </para> </listitem> @@ -4286,7 +4286,7 @@ it will not be added again. The default is <literal>False</literal>. parameters.</emphasis> </para> <para> -<emphasis>Changed in version NEXT_RELEASE: added the +<emphasis>Changed in version 4.9.0: added the <parameter>extra_libs</parameter> parameter.</emphasis> </para> </listitem> @@ -5261,7 +5261,7 @@ This is the same information that is returned by the </listitem> </varlistentry> </variablelist> -<para><emphasis>Added in NEXT_RELEASE</emphasis>: +<para><emphasis>Added in 4.9.0</emphasis>: the <parameter>defaulted</parameter> attribute. </para> diff --git a/template/RELEASE.txt b/template/RELEASE.txt index 77ce83b..128daa1 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 |