From 79db762251d94ce28dd5ae250e100757f18b36d7 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 28 Mar 2021 08:15:51 -0600 Subject: Deprecate Python 3.5. Signed-off-by: Mats Wichmann --- CHANGES.txt | 1 + RELEASE.txt | 1 + ReleaseConfig | 2 +- SCons/Script/Main.py | 2 +- doc/man/scons.xml | 6 ++++++ testing/framework/TestSCons.py | 2 +- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 31b3fb1..cad3e9d 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -45,6 +45,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Remove long-deprecated construction variables PDFCOM, WIN32_INSERT_DEF, WIN32DEFPREFIX, WIN32DEFSUFFIX, WIN32EXPPREFIX, WIN32EXPSUFFIX. All have been replaced by other names since at least 1.0. + - Deprecate Python 3.5 as a supported version. From Dillan Mills: - Add support for the (TARGET,SOURCE,TARGETS,SOURCES,CHANGED_TARGETS,CHANGED_SOURCES}.relpath property. diff --git a/RELEASE.txt b/RELEASE.txt index 22961b1..f468e1b 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -15,6 +15,7 @@ NEW FUNCTIONALITY DEPRECATED FUNCTIONALITY ------------------------ + - Deprecate Python 3.5 as a supported version. - List anything that's been deprecated since the last release diff --git a/ReleaseConfig b/ReleaseConfig index fa4a24b..4195f3f 100755 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -38,7 +38,7 @@ version_tuple = (4, 1, 1, 'a', 0) # cause a warning to be issued (assuming it's not disabled). These values are # mandatory and must be present in the configuration file. unsupported_python_version = (3, 4, 0) -deprecated_python_version = (3, 4, 0) +deprecated_python_version = (3, 5, 0) # If release_date is (yyyy, mm, dd, hh, mm, ss), that is used as the release # date and time. If release_date is (yyyy, mm, dd), it is used for the diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py index 59ffbb7..29906ad 100644 --- a/SCons/Script/Main.py +++ b/SCons/Script/Main.py @@ -33,7 +33,7 @@ it goes here. # these define the range of versions SCons supports unsupported_python_version = (3, 4, 0) -deprecated_python_version = (3, 4, 0) +deprecated_python_version = (3, 5, 0) import SCons.compat diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 1b02e35..5bd50d3 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -536,6 +536,12 @@ by appropriate setting of &consvars;. requires Python 3.5 or higher. There should be no other dependencies or requirements to run &scons;. + +Support for Python 3.5 is deprecated since +&SCons; 4.2 and will be dropped in a future release. +The CPython project has retired 3.5: +. + diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index c02be7a..5937bad 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -58,7 +58,7 @@ from TestCmd import PIPE default_version = '4.1.1ayyyymmdd' python_version_unsupported = (3, 4, 0) -python_version_deprecated = (3, 4, 0) +python_version_deprecated = (3, 5, 0) # In the checked-in source, the value of SConsVersion in the following # line must remain "__ VERSION __" (without the spaces) so the built -- cgit v0.12