From 6208b390c1ac75e4d9984f2156d082eb4fb25dfa Mon Sep 17 00:00:00 2001
From: Benjamin Farley <farleyb@amazon.com>
Date: Thu, 1 Jul 2021 14:17:44 -0600
Subject: [PATCH 1/2] chore: Prep for release 3.0.0

---
 CHANGELOG.rst                         | 15 +++++++++++++++
 SUPPORT_POLICY.rst                    |  8 ++++----
 src/aws_encryption_sdk/identifiers.py |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c81ab30d8..f55b0fbb3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,21 @@
 Changelog
 *********
 
+3.0.0 -- 2021-07-01
+===================
+
+Deprecation
+-----------
+The AWS Encryption SDK for Python no longer supports Python 2 as of major version 3.x. Customers using Python 2
+can still use the 2.x line of the AWS Encryption SDK for Python, which will continue to receive
+security updates for the next 12 months, in accordance with our `Support Policy <https://github.com/aws/aws-encryption-sdk-python/blob/master/SUPPORT_POLICY.rst>`__.
+
+Maintenance
+-----------
+* Move away from deprecated cryptography ``int_from_bytes``
+  `#355 <https://github.com/aws/aws-encryption-sdk-python/pull/355>`_
+
+
 2.4.0 -- 2021-07-01
 ===================
 
diff --git a/SUPPORT_POLICY.rst b/SUPPORT_POLICY.rst
index c787cf1a8..9020b6a11 100644
--- a/SUPPORT_POLICY.rst
+++ b/SUPPORT_POLICY.rst
@@ -26,12 +26,12 @@ This table describes the current support status of each major version of the AWS
       - End of Support
       - 2022-06-30
     * - 2.x
-      - General Availability 
       - Maintenance
-      - 2021-07-01
+      - End of Support
+      - 2022-07-01
     * - 3.x
-      - 
       - General Availability 
-      - 2021-07-01
+      -
+      -
 
 .. _AWS SDKs and Tools Maintenance Policy: https://docs.aws.amazon.com/sdkref/latest/guide/maint-policy.html#version-life-cycle
diff --git a/src/aws_encryption_sdk/identifiers.py b/src/aws_encryption_sdk/identifiers.py
index 4c699d55b..9d94e0378 100644
--- a/src/aws_encryption_sdk/identifiers.py
+++ b/src/aws_encryption_sdk/identifiers.py
@@ -27,7 +27,7 @@
     # We only actually need these imports when running the mypy checks
     pass
 
-__version__ = "2.4.0"
+__version__ = "3.0.0"
 USER_AGENT_SUFFIX = "AwsEncryptionSdkPython/{}".format(__version__)
 
 

From 92a82bee74b6f3b804bfa75d6ba54552c786b8ca Mon Sep 17 00:00:00 2001
From: Benjamin Farley <farleyb@amazon.com>
Date: Thu, 1 Jul 2021 15:30:51 -0600
Subject: [PATCH 2/2] Reference 3.4 in changelog as well

---
 CHANGELOG.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f55b0fbb3..190259b3d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,9 +7,11 @@ Changelog
 
 Deprecation
 -----------
-The AWS Encryption SDK for Python no longer supports Python 2 as of major version 3.x. Customers using Python 2
-can still use the 2.x line of the AWS Encryption SDK for Python, which will continue to receive
-security updates for the next 12 months, in accordance with our `Support Policy <https://github.com/aws/aws-encryption-sdk-python/blob/master/SUPPORT_POLICY.rst>`__.
+The AWS Encryption SDK for Python no longer supports Python 2 or Python 3.4
+as of major version 3.x; only Python 3.5+ is supported. Customers using Python 2
+or Python 3.4 can still use the 2.x line of the AWS Encryption SDK for Python,
+which will continue to receive security updates for the next 12 months, in accordance
+with our `Support Policy <https://github.com/aws/aws-encryption-sdk-python/blob/master/SUPPORT_POLICY.rst>`__.
 
 Maintenance
 -----------