chore: Remove support for Python 2 (#226)

farleyb-amazon · web-flow · commit 582d10367317 · 2021-07-13T10:35:14.000-06:00
diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
@@ -25,11 +25,11 @@ jobs:
           - os: macos-latest
             architecture: x64
         python:
-          - 2.7
           - 3.5
           - 3.6
           - 3.7
           - 3.8
+          - 3.9
           - 3.x
         category:
           - local
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,18 @@
 Changelog
 *********
 
+4.0.0 -- 2021-07-13
+===================
+
+Deprecation
+-----------
+The AWS Encryption SDK CLI no longer supports Python 2 or Python 3.4
+as of major version 4.x; only Python 3.5+ is supported. Customers using Python 2
+or Python 3.4 can still use the 3.x line of the AWS Encryption SDK CLI,
+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-cli/blob/master/SUPPORT_POLICY.rst>`__.
+
+
 3.1.0 -- 2021-07-13
 ===================
 
diff --git a/README.rst b/README.rst
@@ -44,13 +44,8 @@ Getting Started
 Required Prerequisites
 ======================
 
-* Python 2.7+ or 3.4+
-
-  **NOTE: 2.x is the last major version of this library that will
-  support Python 2. Future major versions will begin to adopt changes
-  known to break Python 2. Python 3.4 support will also be removed
-  in future major versions; Python 3.5+ will be required.**
-* aws-encryption-sdk >= 2.3.0
+* Python 3.5+
+* aws-encryption-sdk >= 3.0.0
 
 Installation
 ============
diff --git a/SUPPORT_POLICY.rst b/SUPPORT_POLICY.rst
@@ -30,12 +30,12 @@ This table describes the current support status of each major version of the AWS
       - End of Support
       - 2022-07-13
     * - 3.x
-      - General Availability
       - Maintenance
-      - 2021-07-13
+      - End of Support
+      - 2022-07-13
     * - 4.x
-      - 
       - General Availability 
-      - 2021-07-13
+      - 
+      -
 
 .. _AWS SDKs and Tools Maintenance Policy: https://docs.aws.amazon.com/sdkref/latest/guide/maint-policy.html#version-life-cycle
diff --git a/buildspec.yml b/buildspec.yml
@@ -3,11 +3,6 @@ version: 0.2
 batch:
   fast-fail: false
   build-list:
-    - identifier: py27_integ
-      buildspec: codebuild/py27/integ.yml
-    - identifier: py27_examples
-      buildspec: codebuild/py27/examples.yml
-
     - identifier: py35_integ
       buildspec: codebuild/py35/integ.yml
     - identifier: py35_examples
diff --git a/codebuild/py27/examples.yml b/codebuild/py27/examples.yml
diff --git a/codebuild/py27/integ.yml b/codebuild/py27/integ.yml
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 base64io>=1.0.1
-aws-encryption-sdk~=2.3
+aws-encryption-sdk~=3.0
 setuptools
 attrs>=17.1.0
diff --git a/setup.py b/setup.py
@@ -48,13 +48,12 @@ def get_requirements():
         "Natural Language :: English",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Security",
         "Topic :: Security :: Cryptography",
diff --git a/src/aws_encryption_sdk_cli/internal/identifiers.py b/src/aws_encryption_sdk_cli/internal/identifiers.py
@@ -31,7 +31,7 @@
     "DEFAULT_MASTER_KEY_PROVIDER",
     "OperationResult",
 )
-__version__ = "3.1.0"  # type: str
+__version__ = "4.0.0"  # type: str
 
 #: Suffix added to output files if specific output filename is not specified.
 OUTPUT_SUFFIX = {
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{27,35,36,37,38}-{local,integ,examples},
-    mypy-py{2,3},
+    py{35,36,37,38,39}-{local,integ,examples},
+    mypy-py{3},
     bandit, doc8, readme, docs,
     flake8, pylint,
     flake8-tests, pylint-tests,
@@ -101,17 +101,6 @@ commands =
         {posargs}
     {[testenv:mypy-coverage]commands}
 
-[testenv:mypy-py2]
-basepython = {[testenv:mypy-common]basepython}
-deps = {[testenv:mypy-common]deps}
-commands =
-    python -m mypy \
-        --py2 \
-        --linecoverage-report build \
-        src/aws_encryption_sdk_cli/ \
-        {posargs}
-    {[testenv:mypy-coverage]commands}
-
 # Linters
 [testenv:flake8]
 basepython = python3

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"DEFAULT_MASTER_KEY_PROVIDER",`
`32`	`32`	`"OperationResult",`
`33`	`33`	`)`
`34`		`-__version__ = "3.1.0" # type: str`
	`34`	`+__version__ = "4.0.0" # type: str`
`35`	`35`
`36`	`36`	`#: Suffix added to output files if specific output filename is not specified.`
`37`	`37`	`OUTPUT_SUFFIX = {`