Skip to content

Commit 085b3e1

Browse files
committed
Put master back to develop mode
1 parent 62c1658 commit 085b3e1

File tree

7 files changed

+52
-26
lines changed

7 files changed

+52
-26
lines changed

CHANGES.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ NOTE: Since SCons 4.3.0, Python 3.6.0 or above is required.
1010
NOTE: Since SCons 4.9.0, Python 3.7.0 or above is required.
1111

1212

13+
RELEASE VERSION/DATE TO BE FILLED IN LATER
14+
15+
From John Doe:
16+
17+
- Whatever John Doe did.
18+
19+
1320
RELEASE 4.10.1 - Sun, 16 Nov 2025 10:51:57 -0700
1421

1522
From Thaddeus Crews:

RELEASE.txt

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
A new SCons release, 4.10.1, is now available on the SCons download page:
1+
If you are reading this in the git repository, the contents
2+
refer to *unreleased* changes since the last SCons release.
3+
Past official release announcements appear at:
4+
5+
https://scons.org/tag/releases.html
6+
7+
==================================================================
8+
9+
A new SCons release, NEXT_RELEASE, is now available on the SCons download page:
210

311
https://scons.org/pages/download.html
412

@@ -8,41 +16,50 @@ Here is a summary of the changes since PREVIOUS_RELEASE:
816
NEW FUNCTIONALITY
917
-----------------
1018

11-
- Add support for Visual Studio 2026.
19+
- List new features (presumably why a checkpoint is being released)
20+
21+
DEPRECATED FUNCTIONALITY
22+
------------------------
23+
24+
- List anything that's been deprecated since the last release
1225

1326
CHANGED/ENHANCED EXISTING FUNCTIONALITY
1427
---------------------------------------
1528

16-
- Switch test framework from using profile to cProfile. profile
17-
generates deprecation warnings starting with Python 3.15.
29+
- List modifications to existing features, where the previous behavior
30+
wouldn't actually be considered a bug
1831

1932
FIXES
2033
-----
2134

22-
- Enable membership tests on instances of Literal (non-substituting string).
23-
24-
- In the SequenceTypes tuple used for dynamic type checks, include
25-
the dict contents views, exclude the dictionary view itself as it
26-
is not an iterable sequence type.
35+
- List fixes of outright bugs
2736

2837
IMPROVEMENTS
2938
------------
3039

31-
- Internal: where the find method on a string was used to determine
32-
if a substring is present, use the more readable "in" and "not in".
40+
- List improvements that wouldn't be visible to the user in the
41+
documentation: performance improvements (describe the circumstances
42+
under which they would be observed), or major code cleanups
43+
44+
PACKAGING
45+
---------
46+
47+
- List changes in the way SCons is packaged and/or released
3348

3449
DOCUMENTATION
3550
-------------
3651

37-
- Improve documentation of builder methods and builder objects.
52+
- List any significant changes to the documentation (not individual
53+
typo fixes, even if they're mentioned in src/CHANGES.txt to give
54+
the contributor credit)
55+
56+
DEVELOPMENT
57+
-----------
3858

39-
- Make links clickable in the SetOption and GetOption manpage entries.
59+
- List visible changes in the way SCons is developed
4060

4161
Thanks to the following contributors listed below for their contributions to this release.
4262
==========================================================================================
4363
.. code-block:: text
4464

45-
git shortlog --no-merges -ns 4.10.0..HEAD
46-
12 Mats Wichmann
47-
4 William Deegan
48-
1 Thaddeus Crews
65+
git shortlog --no-merges -ns PREVIOUS_RELEASE..HEAD

ReleaseConfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# If the release type is not 'final', the patchlevel is set to the
3232
# release date. This value is mandatory and must be present in this file.
3333
#version_tuple = (2, 2, 0, 'final', 0)
34-
version_tuple = (4, 10, 1)
34+
version_tuple = (4, 10, 2, 'a', 0)
3535

3636
# Python versions prior to unsupported_python_version cause a fatal error
3737
# when that version is used. Python versions prior to deprecate_python_version

SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ copyright_years = strftime('2001 - %Y')
3636
# This gets inserted into the man pages to reflect the month of release.
3737
month_year = strftime('%B %Y')
3838
project = 'scons'
39-
default_version = '4.10.1'
39+
default_version = '4.10.2'
4040
copyright = f"Copyright (c) {copyright_years} The SCons Foundation"
4141

4242
# We let the presence or absence of various utilities determine whether

bin/upload-release-files.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ $RSYNC $RSYNCOPTS\
3131
# Upload main scons release files:
3232
$RSYNC $RSYNCOPTS \
3333
SCons-$VERSION.tar.gz \
34-
SCons-$VERSION.zip \
3534
CHANGES.txt RELEASE.txt \
3635
$SF_USER@$SF_MACHINE:$SF_TOPDIR/scons/$VERSION/
3736

37+
# SCons-$VERSION.zip \
38+
39+
3840
# Local packages:
3941
$RSYNC $RSYNCOPTS \
4042
scons-local-$VERSION.tar.gz \
@@ -62,18 +64,18 @@ $RSYNC $RSYNCOPTS \
6264
# Doc: copy the doc tgz over; we'll unpack later
6365
$RSYNC $RSYNCOPTS \
6466
scons-doc-$VERSION.tar.gz \
65-
scons@scons.org:public_html/production/doc/$VERSION/
67+
scons@ssh.scons.org:public_html/production/doc/$VERSION/
6668
# Copy the changelog
6769
$RSYNC $RSYNCOPTS \
6870
CHANGES.txt \
69-
scons@scons.org:public_html/production/
71+
scons@ssh.scons.org:public_html/production/
7072
# Note that Announce.txt gets copied over to RELEASE.txt.
7173
# This should be fixed at some point.
7274
$RSYNC $RSYNCOPTS \
7375
RELEASE.txt \
74-
scons@scons.org:public_html/production/RELEASE.txt
76+
scons@ssh.scons.org:public_html/production/RELEASE.txt
7577
# Unpack the doc and repoint doc symlinks:
76-
ssh scons@scons.org "
78+
ssh scons@ssh.scons.org "
7779
cd public_html/production/doc
7880
cd $VERSION
7981
tar xvf scons-doc-$VERSION.tar.gz

doc/user/main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This file is processed by the bin/SConsDoc.py module.
3636

3737
<corpauthor>The SCons Development Team</corpauthor>
3838

39-
<pubdate>Released: Sun, 16 Nov 2025 10:51:57 -0700</pubdate>
39+
<pubdate>Released: Mon, 16 Nov 2025 14:47:52 -0700</pubdate>
4040

4141
<copyright>
4242
<year>2004 - 2025</year>

testing/framework/TestSCons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
# here provides some independent verification that what we packaged
5555
# conforms to what we expect.
5656

57-
default_version = '4.12.0ayyyymmdd'
57+
default_version = '4.10.2ayyyymmdd'
5858

5959
# TODO: these need to be hand-edited when there are changes
6060
python_version_unsupported = (3, 7, 0)

0 commit comments

Comments
 (0)