diff options
author | Mats Wichmann <mats@linux.com> | 2021-03-28 08:15:51 -0600 |
---|---|---|
committer | Mats Wichmann <mats@linux.com> | 2021-03-28 08:19:35 -0600 |
commit | 79db762251d94ce28dd5ae250e100757f18b36d7 (patch) | |
tree | 7190efe443c477b018f6b06e7b53a45775a59f48 | |
parent | 693dd796c0a155e9c63412cc944bea3e336d726d (diff) | |
download | scons-git-79db762251d94ce28dd5ae250e100757f18b36d7.tar.gz |
Deprecate Python 3.5.
Signed-off-by: Mats Wichmann <mats@linux.com>
-rwxr-xr-x | CHANGES.txt | 1 | ||||
-rwxr-xr-x | RELEASE.txt | 1 | ||||
-rwxr-xr-x | ReleaseConfig | 2 | ||||
-rw-r--r-- | SCons/Script/Main.py | 2 | ||||
-rw-r--r-- | doc/man/scons.xml | 6 | ||||
-rw-r--r-- | testing/framework/TestSCons.py | 2 |
6 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 31b3fb17a..cad3e9d01 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 22961b104..f468e1b57 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 fa4a24b05..4195f3fbe 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 59ffbb7eb..29906ad20 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 1b02e35ab..5bd50d3df 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -536,6 +536,12 @@ by appropriate setting of &consvars;.</para> requires Python 3.5 or higher. There should be no other dependencies or requirements to run &scons;. </para> +<para><emphasis> +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: +<ulink url="https://www.python.org/dev/peps/pep-0478"/>. +</emphasis></para> </refsect1> diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index c02be7a5e..5937baddf 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 |