Merge pull request #38 from mattsb42-aws/dev-37

updating examples tests to properly separate import sections

examples/test/test_i_basic_encryption.py

@@ -18,11 +18,12 @@
     os.sep.join([os.path.dirname(__file__), '..', 'src'])
 ])
 
-from basic_encryption import cycle_string
 import botocore.session
-from integration_test_utils import get_cmk_arn, SKIP_MESSAGE, skip_tests
 import pytest
 
+from basic_encryption import cycle_string
+from integration_test_utils import get_cmk_arn, SKIP_MESSAGE, skip_tests
+
 
 @pytest.mark.skipif(skip_tests(), reason=SKIP_MESSAGE)
 def test_cycle_string():

examples/test/test_i_basic_file_encryption_with_multiple_providers.py

@@ -19,11 +19,12 @@
 ])
 import tempfile
 
-from basic_file_encryption_with_multiple_providers import cycle_file
 import botocore.session
-from integration_test_utils import get_cmk_arn, SKIP_MESSAGE, skip_tests
 import pytest
 
+from basic_file_encryption_with_multiple_providers import cycle_file
+from integration_test_utils import get_cmk_arn, SKIP_MESSAGE, skip_tests
+
 
 @pytest.mark.skipif(skip_tests(), reason=SKIP_MESSAGE)
 def test_cycle_file():

examples/test/test_i_basic_file_encryption_with_raw_key_provider.py

@@ -19,9 +19,10 @@
 ])
 import tempfile
 
+import pytest
+
 from basic_file_encryption_with_raw_key_provider import cycle_file
 from integration_test_utils import SKIP_MESSAGE, skip_tests
-import pytest
 
 
 @pytest.mark.skipif(skip_tests(), reason=SKIP_MESSAGE)

examples/test/test_i_data_key_caching_basic.py

@@ -18,9 +18,10 @@
     os.sep.join([os.path.dirname(__file__), '..', 'src'])
 ])
 
+import pytest
+
 from data_key_caching_basic import encrypt_with_caching
 from integration_test_utils import get_cmk_arn, SKIP_MESSAGE, skip_tests
-import pytest
 
 
 @pytest.mark.skipif(skip_tests(), reason=SKIP_MESSAGE)

setup.cfg

@@ -9,3 +9,22 @@ branch = True
 
 [coverage:report]
 show_missing = True
+
+# Flake8 Configuration
+[flake8]
+max_complexity = 10
+max_line_length = 120
+import_order_style = google
+application_import_names = aws_encryption_sdk
+builtins = raw_input
+ignore =
+    # Ignoring D205 and D400 because of false positives
+    D205, D400,
+    # Ignoring D401 pending discussion of imperative mood
+    D401,
+    # Ignoring W503 : line break before binary operator
+    W503
+
+# Doc8 Configuration
+[doc8]
+max-line-length = 120

tox.ini

@@ -82,8 +82,14 @@ commands =
         --application-import-names= \
         examples/src/
     flake8 \
-        # Examples should not treat any imports a application-local.
-        --application-import-names= \
+        # Examples tests must treat the example and helper modules as application-local.
+        --application-import-names="\
+            integration_test_utils,\
+            basic_encryption,\
+            basic_file_encryption_with_multiple_providers,\
+            basic_file_encryption_with_raw_key_provider,\
+            data_key_caching_basic,\
+        " \
         # Ingore D103 missing docstring errors in tests (test names should be self-documenting)
         --ignore D103 \
         examples/test/
@@ -96,7 +102,7 @@ deps =
     pylint
 commands =
     pylint \
-        --rcfile=pylintrc \
+        --rcfile=src/pylintrc \
         src/aws_encryption_sdk/  \
         setup.py
 
@@ -219,22 +225,3 @@ deps =
 commands =
     {[testenv:build]commands}
     twine upload --skip-existing --repository pypi dist/*
-
-# Flake8 Configuration
-[flake8]
-max_complexity = 10
-max_line_length = 120
-import_order_style = google
-application_import_names = aws_encryption_sdk
-builtins = raw_input
-ignore =
-    # Ignoring D205 and D400 because of false positives
-    D205, D400,
-    # Ignoring D401 pending discussion of imperative mood
-    D401,
-    # Ignoring W503 : line break before binary operator
-    W503
-
-# Doc8 Configuration
-[doc8]
-max-line-length = 120