summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2021-07-15 11:11:09 -0700
committerGitHub <noreply@github.com>2021-07-15 11:11:09 -0700
commit7d3b4c52d029d17c4a608b7601a1d8a843d8711d (patch)
treeefab21738629ed3befcf5fe93aa54f228b130efb
parent273ac6bccd4aff89a6a18d0e27ab2bcddffe6823 (diff)
parent573e5d8642daba23495870ff0ca9a5d53a5f5cbe (diff)
downloadscons-git-7d3b4c52d029d17c4a608b7601a1d8a843d8711d.tar.gz
Merge pull request #3976 from bdbaddog/reduce_travis_usage
Reduce travis usage, add py 3.5 deprecation notices, and update copyright dates
-rw-r--r--.travis.yml12
-rwxr-xr-xCHANGES.txt2
-rwxr-xr-xREADME-SF.rst5
-rw-r--r--README-local3
-rwxr-xr-xREADME-package.rst8
-rwxr-xr-xREADME.rst10
-rwxr-xr-xRELEASE.txt3
7 files changed, 29 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 7b930193d..040b1616a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,18 +48,18 @@ jobs:
- <<: *test_job
python: 3.5
- - <<: *test_job
- python: 3.6
- dist: xenial
+# - <<: *test_job
+# python: 3.6
+# dist: xenial
# to keep number of runs down, skip this since tested in 'coverage'
#- <<: *test_job
# python: 3.7
# dist: xenial # required for Python >= 3.7
- - <<: *test_job
- python: 3.8
- dist: bionic
+# - <<: *test_job
+# python: 3.8
+# dist: bionic
- <<: *test_job
python: 3.9
diff --git a/CHANGES.txt b/CHANGES.txt
index 6afd4c0a8..3932a1f27 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,7 @@
Change Log
NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
-NOTE: The 4.2.0 Release of SCons will drop Python 3.5 Support
+NOTE: The 4.2.0 Release of SCons will deprecate Python 3.5 Support. Python 3.5 support will be dropped in the next major release.
RELEASE VERSION/DATE TO BE FILLED IN LATER
diff --git a/README-SF.rst b/README-SF.rst
index fce28d91c..337fbf5ab 100755
--- a/README-SF.rst
+++ b/README-SF.rst
@@ -50,6 +50,9 @@ Execution Requirements
Running SCons requires Python 3.5 or higher. There should be no other
dependencies or requirements to run scons.
+As of SCons 4.2.0 support for Python 3.5 is deprecated and will be removed
+with the next major release.
+
The default SCons configuration assumes use of the Microsoft Visual C++
compiler suite on Win32 systems, and assumes a C compiler named 'cc', a C++
compiler named 'c++', and a Fortran compiler named 'gfortran' (such as found
@@ -609,5 +612,5 @@ many contributors, including but not at all limited to:
\... and many others.
-Copyright (c) 2001 - 2020 The SCons Foundation
+Copyright (c) 2001 - 2021 The SCons Foundation
diff --git a/README-local b/README-local
index 2d3dac12f..86f52681b 100644
--- a/README-local
+++ b/README-local
@@ -47,6 +47,9 @@ EXECUTION REQUIREMENTS
Running SCons requires Python 3.5 or higher.
There should be no other dependencies or requirements to run SCons.
+As of SCons 4.2.0 support for Python 3.5 is deprecated and will be removed
+with the next major release.
+
The default SCons configuration assumes use of the Microsoft Visual C++
compiler suite on WIN32 systems (either through the Visual Studio
product, or through the separate Build Tools), and assumes a C compiler
diff --git a/README-package.rst b/README-package.rst
index bc0e7efc8..f9833f78a 100755
--- a/README-package.rst
+++ b/README-package.rst
@@ -13,8 +13,8 @@ SCons - a software construction tool
:target: https://sourceforge.net/projects/scons
:alt: Sourceforge Total Downloads
-.. image:: https://travis-ci.org/SCons/scons.svg?branch=master
- :target: https://travis-ci.org/SCons/scons
+.. image:: https://travis-ci.com/SCons/scons.svg?branch=master
+ :target: https://travis-ci.com/SCons/scons
:alt: Travis CI build status
.. image:: https://ci.appveyor.com/api/projects/status/github/SCons/scons?svg=true&branch=master
@@ -47,6 +47,8 @@ Requirements
Running SCons requires Python 3.5 or higher. There should be no other
dependencies or requirements to run SCons.
+As of SCons 4.2.0 support for Python 3.5 is deprecated and will be removed
+with the next major release.
By default, SCons knows how to search for available programming tools on
various systems--see the SCons man page for details. You may, of course,
@@ -129,5 +131,5 @@ Check the SCons web site at:
http://www.scons.org/
-Copyright (c) 2001 - 2020 The SCons Foundation
+Copyright (c) 2001 - 2021 The SCons Foundation
diff --git a/README.rst b/README.rst
index cc14a01ec..54232f874 100755
--- a/README.rst
+++ b/README.rst
@@ -13,8 +13,8 @@ SCons - a software construction tool
:target: https://sourceforge.net/projects/scons
:alt: Sourceforge Total Downloads
-.. image:: https://travis-ci.org/SCons/scons.svg?branch=master
- :target: https://travis-ci.org/SCons/scons
+.. image:: https://travis-ci.com/SCons/scons.svg?branch=master
+ :target: https://travis-ci.com/SCons/scons
:alt: Travis CI build status
.. image:: https://ci.appveyor.com/api/projects/status/github/SCons/scons?svg=true&branch=master
@@ -79,6 +79,10 @@ Execution Requirements
Running SCons requires Python 3.5 or higher. There should be no other
dependencies or requirements to run scons
+As of SCons 4.2.0 support for Python 3.5 is deprecated and will be removed
+with the next major release.
+
+
The default SCons configuration assumes use of the Microsoft Visual C++
compiler suite on Win32 systems, and assumes a C compiler named 'cc', a C++
compiler named 'c++', and a Fortran compiler named 'gfortran' (such as found
@@ -629,5 +633,5 @@ many contributors, including but not at all limited to:
\... and many others.
-Copyright (c) 2001 - 2020 The SCons Foundation
+Copyright (c) 2001 - 2021 The SCons Foundation
diff --git a/RELEASE.txt b/RELEASE.txt
index 71536c063..688673980 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -6,6 +6,9 @@ on the SCons download page:
Here is a summary of the changes since 4.1.0:
+NOTE: The 4.2.0 Release of SCons will deprecate Python 3.5 Support. Python 3.5 support will be dropped in the next major release.
+
+
NEW FUNCTIONALITY
-----------------