Merge pull request #14 from aws/sync-public

Sync master with public repo

Author: scottarc

buildspec.yml

@@ -13,3 +13,6 @@ batch:
       buildspec: codebuild/python3.7.yml
     - identifier: python3_8
       buildspec: codebuild/python3.8.yml
+
+    - identifier: code_coverage
+      buildspec: codebuild/coverage/coverage.yml

codebuild/coverage/coverage.yml

@@ -0,0 +1,14 @@
+version: 0.2
+
+env:
+  variables:
+    TOXENV: "coverage"
+
+phases:
+  install:
+    runtime-versions:
+      python: latest
+  build:
+    commands:
+      - pip install tox
+      - tox

examples/src/aws_kms_encrypted_client.py

@@ -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.")

examples/src/aws_kms_encrypted_resource.py

@@ -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.")

setup.cfg

@@ -9,6 +9,7 @@ branch = True
 
 [coverage:report]
 show_missing = True
+fail_under = 90
 
 [mypy]
 ignore_missing_imports = True

test/upstream-requirements-py27.txt

@@ -33,7 +33,7 @@ hypothesis==4.40.0
 idna==2.8
 importlib-metadata==0.23
 ipaddress==1.0.22
-Jinja2==2.10.3
+Jinja2==2.11.3
 jmespath==0.9.4
 jsondiff==1.1.2
 jsonpatch==1.24
@@ -60,10 +60,10 @@ pytest-xdist==1.30.0
 python-dateutil==2.8.0
 python-jose==3.0.1
 pytz==2019.3
-PyYAML==5.1.2
+PyYAML==5.4
 requests==2.22.0
 responses==0.10.6
-rsa==4.0
+rsa==4.5
 s3transfer==0.2.1
 scandir==1.10.0
 six==1.12.0

test/upstream-requirements-py37.txt

@@ -22,7 +22,7 @@ future==0.18.0
 hypothesis==4.40.0
 idna==2.8
 importlib-metadata==0.23
-Jinja2==2.10.3
+Jinja2==2.11.3
 jmespath==0.9.4
 jsondiff==1.1.2
 jsonpatch==1.24
@@ -48,10 +48,10 @@ pytest-xdist==1.30.0
 python-dateutil==2.8.0
 python-jose==3.0.1
 pytz==2019.3
-PyYAML==5.1.2
+PyYAML==5.4
 requests==2.22.0
 responses==0.10.6
-rsa==4.0
+rsa==4.5
 s3transfer==0.2.1
 six==1.12.0
 sshpubkeys==3.1.0

tox.ini

@@ -35,8 +35,12 @@ envlist =
 # test-release :: Builds dist files and uploads to testpypi pypirc profile.
 # release :: Builds dist files and uploads to pypi pypirc profile.
 
+# Reporting environments:
+#
+# coverage :: Runs code coverage, failing the build if coverage is below the configured threshold
+
 [testenv:base-command]
-commands = pytest --basetemp={envtmpdir} -l --cov dynamodb_encryption_sdk {posargs}
+commands = pytest --basetemp={envtmpdir} -l {posargs}
 
 [testenv]
 passenv =
@@ -86,6 +90,10 @@ commands =
     # Only run examples tests
     examples: {[testenv:base-command]commands} examples/test/ -m "examples"
 
+# Run code coverage on the unit tests
+[testenv:coverage]
+commands = {[testenv:base-command]commands} --cov dynamodb_encryption_sdk test/ -m "local and not slow and not veryslow and not nope"
+
 # Verify that local tests work without environment variables present
 [testenv:nocmk]
 basepython = python3