Merge pull request #21613 from tacaswell/sec_update_supported_versions

QuLogic · web-flow · commit f93c0a3dcb82 · 2021-11-12T16:35:45.000-05:00
SEC/DOC update supported versions
diff --git a/SECURITY.md b/SECURITY.md
@@ -8,24 +8,23 @@ versions.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 3.3.x   | :white_check_mark: |
-| 3.2.x   | :white_check_mark: |
-| 3.1.x   | :x:                |
-| 3.0.x   | :x:                |
-| 2.2.x   | :white_check_mark: |
-| < 2.2   | :x:                |
+| 3.5.x   | :white_check_mark: |
+| 3.4.x   | :white_check_mark: |
+| 3.3.x   | :x:                |
+| < 3.3   | :x:                |
+
 
 ## Reporting a Vulnerability
 
-If you have found a security vulnerability, in order to keep it confidential, 
+If you have found a security vulnerability, in order to keep it confidential,
 please do not report an issue on GitHub.
 
-Please email us details of the vulnerability at matplotlib@numfocus.org; 
+Please email us details of the vulnerability at matplotlib@numfocus.org;
 include a description and proof-of-concept that is [short and
 self-contained](http://www.sscce.org/).
 
-You should expect a response within a week of your email. Depending on the 
+You should expect a response within a week of your email. Depending on the
 severity of the issue, this may require some time to draft an immediate bugfix
 release. Less severe issues may be held until the next release.
 
-We do not award bounties for security vulnerabilities. 
+We do not award bounties for security vulnerabilities.
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
@@ -172,6 +172,19 @@ Python3 yet.  You will need to create a Python2 environment with
 Address any issues which may arise.  The internal links are checked on Circle
 CI, this should only flag failed external links.
 
+
+Update supported versions in SECURITY.md
+----------------------------------------
+
+For minor version release update the table in :file:`SECURITY.md` to specify
+that the 2 most recent minor releases in the current major version series are
+supported.
+
+For a major version release update the table in :file:`SECURITY.md` to specify
+that the last minor version in the previous major version series is still
+supported.  Dropping support for the last version of a major version series
+will be handled on an ad-hoc basis.
+
 .. _release_tag:
 
 Create release commit and tag
