Updates to handle new pylint requirements (#196)

* pylint max-attributes appears to be ratcheted down recently

* remove unnecessary comprehensions

* whitelist some pylint use-constant-test false-positives

* reorganize backwards compatibility test requirements definitions
attrs==19.2.0 removed a deprecated feature that aws-encryption-sdk==1.3.3 depended on.
This reorganization lets us define specific requirements bounds for old versions of aws-encryption-sdk
that will probably continue to be necessary as these old versions age.

* remove unnecessary comprehensions

* add newlines to the end of all requirements files

Author: mattsb42-aws

decrypt_oracle/setup.py

@@ -22,7 +22,7 @@ def get_version():
 def get_requirements():
     """Read the requirements file."""
     requirements = read("requirements-actual.txt")
-    return [r for r in requirements.strip().splitlines()]
+    return list(requirements.strip().splitlines())
 
 
 setup(

doc/requirements.txt

@@ -1,2 +1,2 @@
 sphinx>=1.3.0
-sphinx_rtd_theme
+sphinx_rtd_theme

requirements.txt

@@ -1,4 +1,4 @@
 boto3>=1.4.4
 cryptography>=1.8.1
 attrs>=17.4.0
-wrapt>=1.10.11
+wrapt>=1.10.11

setup.py

@@ -22,7 +22,7 @@ def get_version():
 def get_requirements():
     """Reads the requirements file."""
     requirements = read("requirements.txt")
-    return [r for r in requirements.strip().splitlines()]
+    return list(requirements.strip().splitlines())
 
 
 setup(

src/aws_encryption_sdk/caches/__init__.py

@@ -143,6 +143,7 @@ class CryptoMaterialsCacheEntryHints(object):
 
 @attr.s(hash=False)
 class CryptoMaterialsCacheEntry(object):
+    # pylint: disable=too-many-instance-attributes
     """Value and metadata store for cryptographic materials cache entries.
 
     :param bytes cache_key: Identifier for entries in cache

src/aws_encryption_sdk/streaming_client.py

@@ -235,7 +235,7 @@ def read(self, b=-1):
         if not self._message_prepped:
             self._prep_message()
 
-        if self.closed:
+        if self.closed:  # dynamic values confuse pylint: disable=using-constant-test
             raise ValueError("I/O operation on closed file")
 
         if b >= 0:
@@ -283,7 +283,7 @@ def readline(self):
 
     def readlines(self):
         """Reads all chunks of output, outputting a list as defined in the IOBase specification."""
-        return [line for line in self]
+        return list(self)
 
     def __iter__(self):
         """Make this class and subclasses identify as iterators."""
@@ -292,7 +292,7 @@ def __iter__(self):
     def next(self):
         """Provides hook for Python2 iterator functionality."""
         _LOGGER.debug("reading next")
-        if self.closed:
+        if self.closed:  # dynamic values confuse pylint: disable=using-constant-test
             _LOGGER.debug("stream is closed")
             raise StopIteration()
 

src/aws_encryption_sdk/structures.py

@@ -20,6 +20,7 @@
 
 @attr.s(hash=True)
 class MessageHeader(object):
+    # pylint: disable=too-many-instance-attributes
     """Deserialized message header object.
 
     :param version: Message format version, per spec

test/requirements.txt

@@ -1,4 +1,4 @@
 mock
 pytest>=3.3.1
 pytest-cov
-pytest-mock
+pytest-mock

test/unit/test_identifiers.py

@@ -41,7 +41,7 @@ def test_algorithm_safe_to_cache(check_algorithm, safe_to_cache):
         assert not check_algorithm.safe_to_cache()
 
 
-@pytest.mark.parametrize("suite", [suite for suite in EncryptionSuite])
+@pytest.mark.parametrize("suite", list(EncryptionSuite))
 def test_encryption_suite_invalid_kdf(suite):
     mock_kdf = Mock()
     mock_kdf.input_length.return_value = 1

test_vector_handlers/compatibility-requirements/1.3.3

@@ -0,0 +1,2 @@
+aws-encryption-sdk==1.3.3
+attrs<19.2.0

test_vector_handlers/compatibility-requirements/1.3.max

@@ -0,0 +1 @@
+aws-encryption-sdk >= 1.3.3, < 1.4.0

test_vector_handlers/compatibility-requirements/latest

@@ -0,0 +1 @@
+aws-encryption-sdk

test_vector_handlers/requirements.txt

@@ -1,3 +1,3 @@
 attrs >= 17.4.0
 aws-encryption-sdk
-six
+six

test_vector_handlers/setup.py

@@ -22,7 +22,7 @@ def get_version():
 def get_requirements():
     """Read the requirements file."""
     requirements = read("requirements.txt")
-    return [r for r in requirements.strip().splitlines()]
+    return list(requirements.strip().splitlines())
 
 
 setup(

test_vector_handlers/test/requirements.txt

@@ -1,4 +1,4 @@
 mock
 pytest>=3.3.1
 pytest-cov
-pytest-mock
+pytest-mock

test_vector_handlers/tox.ini

@@ -46,9 +46,9 @@ passenv =
 sitepackages = False
 deps =
     -rtest/requirements.txt
-    awses_1.3.3: aws-encryption-sdk==1.3.3
-    awses_1.3.max: aws-encryption-sdk >= 1.3.3, < 1.4.0
-    awses_latest: aws-encryption-sdk
+    awses_1.3.3: -rcompatibility-requirements/1.3.3
+    awses_1.3.max: -rcompatibility-requirements/1.3.max
+    awses_latest: -rcompatibility-requirements/latest
 commands = {[testenv:base-command]commands}
 
 [testenv:full-encrypt]