diff --git a/decrypt_oracle/setup.py b/decrypt_oracle/setup.py index e5d9ec84f..e8dfb2aac 100644 --- a/decrypt_oracle/setup.py +++ b/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( diff --git a/doc/requirements.txt b/doc/requirements.txt index 29e319455..9a54370d6 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,2 +1,2 @@ sphinx>=1.3.0 -sphinx_rtd_theme \ No newline at end of file +sphinx_rtd_theme diff --git a/requirements.txt b/requirements.txt index f04114485..7f8f0d532 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ boto3>=1.4.4 cryptography>=1.8.1 attrs>=17.4.0 -wrapt>=1.10.11 \ No newline at end of file +wrapt>=1.10.11 diff --git a/setup.py b/setup.py index 1afa9d869..6ceb2d8fb 100644 --- a/setup.py +++ b/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( diff --git a/src/aws_encryption_sdk/caches/__init__.py b/src/aws_encryption_sdk/caches/__init__.py index 3d3189441..9d2afa485 100644 --- a/src/aws_encryption_sdk/caches/__init__.py +++ b/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 diff --git a/src/aws_encryption_sdk/streaming_client.py b/src/aws_encryption_sdk/streaming_client.py index 90dc9d25c..504f68977 100644 --- a/src/aws_encryption_sdk/streaming_client.py +++ b/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() diff --git a/src/aws_encryption_sdk/structures.py b/src/aws_encryption_sdk/structures.py index 8229d65fb..97e4c1d13 100644 --- a/src/aws_encryption_sdk/structures.py +++ b/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 diff --git a/test/requirements.txt b/test/requirements.txt index d1b878ce2..152b5dbf4 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,4 +1,4 @@ mock pytest>=3.3.1 pytest-cov -pytest-mock \ No newline at end of file +pytest-mock diff --git a/test/unit/test_identifiers.py b/test/unit/test_identifiers.py index 8f13b1314..3fd421b65 100644 --- a/test/unit/test_identifiers.py +++ b/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 diff --git a/test_vector_handlers/compatibility-requirements/1.3.3 b/test_vector_handlers/compatibility-requirements/1.3.3 new file mode 100644 index 000000000..7aa43f6be --- /dev/null +++ b/test_vector_handlers/compatibility-requirements/1.3.3 @@ -0,0 +1,2 @@ +aws-encryption-sdk==1.3.3 +attrs<19.2.0 diff --git a/test_vector_handlers/compatibility-requirements/1.3.max b/test_vector_handlers/compatibility-requirements/1.3.max new file mode 100644 index 000000000..72c946bf5 --- /dev/null +++ b/test_vector_handlers/compatibility-requirements/1.3.max @@ -0,0 +1 @@ +aws-encryption-sdk >= 1.3.3, < 1.4.0 diff --git a/test_vector_handlers/compatibility-requirements/latest b/test_vector_handlers/compatibility-requirements/latest new file mode 100644 index 000000000..d0197da7f --- /dev/null +++ b/test_vector_handlers/compatibility-requirements/latest @@ -0,0 +1 @@ +aws-encryption-sdk diff --git a/test_vector_handlers/requirements.txt b/test_vector_handlers/requirements.txt index 21e4de2f0..9de0ee532 100644 --- a/test_vector_handlers/requirements.txt +++ b/test_vector_handlers/requirements.txt @@ -1,3 +1,3 @@ attrs >= 17.4.0 aws-encryption-sdk -six \ No newline at end of file +six diff --git a/test_vector_handlers/setup.py b/test_vector_handlers/setup.py index f191b3869..bd16c76c8 100644 --- a/test_vector_handlers/setup.py +++ b/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( diff --git a/test_vector_handlers/test/requirements.txt b/test_vector_handlers/test/requirements.txt index d1b878ce2..152b5dbf4 100644 --- a/test_vector_handlers/test/requirements.txt +++ b/test_vector_handlers/test/requirements.txt @@ -1,4 +1,4 @@ mock pytest>=3.3.1 pytest-cov -pytest-mock \ No newline at end of file +pytest-mock diff --git a/test_vector_handlers/tox.ini b/test_vector_handlers/tox.ini index 748ba4881..fc2c8d5a7 100644 --- a/test_vector_handlers/tox.ini +++ b/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]