Skip to content

Commit

Permalink
Update NEXT_RELEASE to 4.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bdbaddog committed Mar 2, 2025
1 parent c0572bd commit 8807cc0
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions SCons/Environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 = {}
Expand Down
4 changes: 2 additions & 2 deletions SCons/Environment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions SCons/EnvironmentTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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'}")
Expand Down Expand Up @@ -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():
Expand Down Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions SCons/SConf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion SCons/Scanner/C.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion SCons/Script/SConsOptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion SCons/Script/SConscript.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion SCons/Script/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SCons/Variables/PackageVariable.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion SCons/Variables/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"""
Expand Down
2 changes: 1 addition & 1 deletion doc/generated/builders.gen
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions doc/generated/functions.gen
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions doc/man/scons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion template/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8807cc0

Please sign in to comment.