Put master back in post release/develop mode

Author: bdbaddog

CHANGES.txt

@@ -7,6 +7,13 @@
 NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported
 
+RELEASE  VERSION/DATE TO BE FILLED IN LATER
+
+      From John Doe:
+
+        - Whatever John Doe did.
+
+
 RELEASE 4.7.0 -  Sun, 17 Mar 2024 17:22:20 -0700
 
   From Ataf Fazledin Ahamed:

RELEASE.txt

@@ -1,115 +1,65 @@
-A new SCons release, 4.7.0, is now available on the SCons download page:
+If you are reading this in the git repository, the contents
+refer to *unreleased* changes since the last SCons release.
+Past official release announcements appear at:
+
+    https://scons.org/tag/releases.html
+
+==================================================================
+
+A new SCons release, 4.7.1, is now available on the SCons download page:
 
     https://scons.org/pages/download.html
 
-Here is a summary of the changes since 4.6.0:
+
+Here is a summary of the changes since 4.7.0:
 
 NEW FUNCTIONALITY
 -----------------
 
-- Method unlink_files was added to the TestCmd class that unlinks a list of files
-  from a specified directory.  An attempt to unlink a file is made only when the
-  file exists; otherwise, the file is ignored.
+- List new features (presumably why a checkpoint is being released)
+
+DEPRECATED FUNCTIONALITY
+------------------------
+
+- List anything that's been deprecated since the last release
 
 CHANGED/ENHANCED EXISTING FUNCTIONALITY
 ---------------------------------------
 
-- Add an optional argument list string to configure's CheckFunc method so
-  that the generated function argument list matches the function's
-  prototype when including a header file. Fixes GH Issue #4320
-- Now supports pre-release Python 3.13
-- Support for Python versions without support for the `threading` package has been removed
-- Dropped three unused warning classes: DeprecatedSourceCodeWarning,
-  TaskmasterNeedsExecuteWarning, DeprecatedMissingSConscriptWarning.
-* Two warning classes that are actually used were added to manpage section on
-  enabling warnings (cache-cleanup-error, future-reserved-variable).
+- List modifications to existing features, where the previous behavior
+  wouldn't actually be considered a bug
 
 FIXES
 -----
 
-- Fix of the --debug=sconscript option to return exist statements when using return
-  statement with stop flag enabled
-- MSVS: prevent overwriting the SCons environment variable SCONS_HOME with the OS
-  environment value of SCONS_HOME in the msvs tool.
-- MSVC: Fix the detection of Visual Studio 2015 Express ('14.0Exp') by adding a
-  registry key definition and updating the installation root-relative registry value
-  at runtime for the location of the VC folder.
-- MSVS: Fix the msvs project generation test for MSVS 6.0 to use the correct name of
-  the generated project file.
-- MSVS: Fix the msvs project generation test scripts so that "false positive" tests
-  results are not possible when the initial build is successful and the command-line
-  build of the project file fails.
-- On Windows platform, when collecting command output (Configure checks),
-  make sure decoding of bytes doesn't fail.
-- Documentation indicated that both Pseudo() and env.Pseudo() were usable,
-  but Pseudo() did not work; is now enabled.
-- Improve handling of file data that SCons itself processes - as in
-  scanners - try harder to decode non-UTF-8 text.
-- PyPackageDir no longer fails if passed a module name which cannot be found,
-  now returns None.
-- Add locking around creation of CacheDir config file. Fixes issue #4489.
+- List fixes of outright bugs
 
 IMPROVEMENTS
 ------------
 
-- Use of NotImplemented instead of NotImplementedError for special methods
-  of _ListVariable class
-- The NewParallel scheduler is now the default, the `tm_v2` flag is removed,
-  and the old scheduler is opt-in under `--experimental=legacy_sched`. Additionally,
-  the new scheduler is now used for -j1 builds as well.
-  NOTE: This should significantly improve SCons performance for larger parallel builds
-        (Larger -j values)
-- CacheDir writes no longer happen within the taskmaster critical section, and therefore
-  can run in parallel with both other CacheDir writes and the taskmaster DAG walk.
-- The NewParallel scheduler now only adds threads as new work requiring execution
-  is discovered, up to the limit set by -j. This should reduce resource utilization
-  when the achievable parallelism in the DAG is less than the -j limit.
-- Dumping an environment with `json` formatting will now explicitly specify if a given
-  value cannot be serialized.
+- List improvements that wouldn't be visible to the user in the
+  documentation:  performance improvements (describe the circumstances
+  under which they would be observed), or major code cleanups
 
 PACKAGING
 ---------
 
-- Remove unnecessary dependencies on pypi packages from setup.cfg
-- SCons documentation build can now be controlled through SKIP_DOC
-  variable - rather than just true/false can now specify
-  skip none, skip all, skip pdf docs, skip api docs.
+- List changes in the way SCons is packaged and/or released
 
 DOCUMENTATION
 -------------
 
-- Fixed the Scanner examples in the User Guide to be runnable and added
-  some more explanation. Clarified discussion of the scanner function in
-  the Scanner Objects section of the manpage.
-- The manpage entry for Pseudo was clarified.
-- The manpage entry for SharedLibrary was clarified.
-- Update API docs for Warnings framework; add two warns to manpage
-  enable/disable control.
-- More consistent use of &Python; in the manpage.  A few links added.
-  A warning about overwriting env['ENV'] and one about Configure
-  checks possibly not running in in no-exec mode also added.
-- Clarify how SCons finds the project top directory, and what that is used for.
-- Clarify MergeFlags usage of a dict argument.
+- List any significant changes to the documentation (not individual
+  typo fixes, even if they're mentioned in src/CHANGES.txt to give
+  the contributor credit)
 
 DEVELOPMENT
 -----------
 
-- Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
-- Created SCons.Util.sctyping to contain complex type information, allowing
-  for repo-wide type hinting without causing cyclical dependencies.
+- List visible changes in the way SCons is developed
 
 Thanks to the following contributors listed below for their contributions to this release.
 ==========================================================================================
 .. code-block:: text
 
-    git shortlog --no-merges -ns 4.6.0..HEAD
-    26  Andrew Morrow
-    24  Mats Wichmann
-    14  William Deegan
-     7  Joseph Brill
-     6  StenGruener
-     3  Prabhu S. Khalsa
-     3  Thaddeus Crews
-     2  fazledyn-or
-     1  Michał Górny
-     1  Piotr Siupa
+    git shortlog --no-merges -ns 4.0.1..HEAD

ReleaseConfig

@@ -31,7 +31,7 @@
 # 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, 6, 1, 'a', 0)
+version_tuple = (4, 6, 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

SConstruct

@@ -36,7 +36,7 @@ copyright_years = strftime('2001 - %Y')
 # This gets inserted into the man pages to reflect the month of release.
 month_year = strftime('%B %Y')
 project = 'scons'
-default_version = '4.7.0'
+default_version = '4.7.1'
 copyright = f"Copyright (c) {copyright_years} The SCons Foundation"
 
 # We let the presence or absence of various utilities determine whether

doc/user/main.xml

@@ -33,10 +33,10 @@ SPDX-License-Identifier: MIT
 
     <corpauthor>The SCons Development Team</corpauthor>
 
-    <pubdate>Released: Mon, 19 Nov 2023 17:52:53 -0700</pubdate>
+    <pubdate>Released: Mon, 17 Mar 2024 17:52:49 -0700</pubdate>
 
     <copyright>
-        <year>2004 - 2023</year>
+        <year>2004 - 2024</year>
         <holder>The SCons Foundation</holder>
     </copyright>
 

testing/framework/TestSCons.py

@@ -55,7 +55,7 @@
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '4.7.0ayyyymmdd'
+default_version = '4.7.1ayyyymmdd'
 
 # TODO: these need to be hand-edited when there are changes
 python_version_unsupported = (3, 6, 0)