chore: Fix broken CI (#441)

Author: lavaleri

.github/workflows/ci_tests.yaml

@@ -9,46 +9,6 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  # Hypothesis no longer supports Python 2 and
-  # there is a bug that appears with our slow tests
-  # only on Python 2.
-  # Until we also drop Python 2 support,
-  # the workaround is just that we don't run the slow tests
-  # on Python 2.
-  py2-tests:
-    runs-on: ${{ matrix.platform.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        platform:
-          - os: ubuntu-latest
-            architecture: x64
-          - os: windows-latest
-            architecture: x64
-          # x86 builds are only meaningful for Windows
-          - os: windows-latest
-            architecture: x86
-          - os: macos-latest
-            architecture: x64
-        category:
-          - local-fast
-    # These require credentials.
-    # Enable them once we sort how to provide them.
-    #          - integ-fast
-    #          - examples
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
-        with:
-          python-version: 2.7
-          architecture: ${{ matrix.platform.architecture }}
-      - run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade -r ci-requirements.txt
-      - name: run test
-        env:
-          TOXENV: ${{ matrix.category }}
-        run: tox -- -vv
   tests:
     runs-on: ${{ matrix.platform.os }}
     strategy:
@@ -65,8 +25,6 @@ jobs:
           - os: macos-latest
             architecture: x64
         python:
-          - 3.5
-          - 3.6
           - 3.7
           - 3.8
           - 3.x
@@ -110,22 +68,3 @@ jobs:
         env:
           TOXENV: ${{ matrix.category }}
         run: tox -- -vv
-  upstream-py2:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        category:
-          - test-upstream-requirements-py27
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
-        with:
-          python-version: 2.7
-      - run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade -r ci-requirements.txt
-      - name: run test
-        env:
-          TOXENV: ${{ matrix.category }}
-        run: tox -- -vv

buildspec.yml

@@ -3,12 +3,6 @@ version: 0.2
 batch:
   fast-fail: false
   build-list:
-    - identifier: python2_7
-      buildspec: codebuild/python2.7.yml
-    - identifier: python3_5
-      buildspec: codebuild/python3.5.yml
-    - identifier: python3_6
-      buildspec: codebuild/python3.6.yml
     - identifier: python3_7
       buildspec: codebuild/python3.7.yml
     - identifier: python3_8

codebuild/python2.7.yml

@@ -14,5 +14,7 @@ phases:
         python: latest
   build:
     commands:
-      - pip install tox
+      - pyenv install 3.8.6
+      - pyenv local 3.8.6
+      - pip install tox tox-pyenv
       - tox

codebuild/python3.5.yml

@@ -29,7 +29,7 @@ def get_version():
     return _release
 
 
-project = u"dynamodb-encryption-sdk-python"
+project = "dynamodb-encryption-sdk-python"
 version = get_version()
 release = get_release()
 
@@ -53,7 +53,7 @@ def get_version():
 source_suffix = ".rst"  # The suffix of source filenames.
 master_doc = "index"  # The master toctree document.
 
-copyright = u"%s, Amazon" % datetime.now().year  # pylint: disable=redefined-builtin
+copyright = "%s, Amazon" % datetime.now().year  # pylint: disable=redefined-builtin
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.

codebuild/python3.6.yml

@@ -124,15 +124,15 @@ def encrypt_batch_items(table_name, aws_cmk_id):
     def _select_index_from_item(item):
         """Find the index keys that match this item."""
         for index in index_keys:
-            if all([item[key] == value for key, value in index.items()]):
+            if all(item[key] == value for key, value in index.items()):
                 return index
 
         raise Exception("Index key not found in item.")
 
     def _select_item_from_index(index, all_items):
         """Find the item that matches these index keys."""
         for item in all_items:
-            if all([item[key] == value for key, value in index.items()]):
+            if all(item[key] == value for key, value in index.items()):
                 return item
 
         raise Exception("Index key not found in item.")

codebuild/python3.8.yml

@@ -76,15 +76,15 @@ def encrypt_batch_items(table_name, aws_cmk_id):
     def _select_index_from_item(item):
         """Find the index keys that match this item."""
         for index in index_keys:
-            if all([item[key] == value for key, value in index.items()]):
+            if all(item[key] == value for key, value in index.items()):
                 return index
 
         raise Exception("Index key not found in item.")
 
     def _select_item_from_index(index, all_items):
         """Find the item that matches these index keys."""
         for item in all_items:
-            if all([item[key] == value for key, value in index.items()]):
+            if all(item[key] == value for key, value in index.items()):
                 return item
 
         raise Exception("Index key not found in item.")

doc/conf.py

@@ -3,6 +3,7 @@
 disable =
     duplicate-code,  # these examples often feature similar code
     too-many-locals,  # for these examples, we prioritize keeping everything together for simple readability
+    consider-using-f-string, # Not supported in Python 3.5
 
 [BASIC]
 # Allow function names up to 50 characters