Skip to content

Fixing emergent issues identified and caused by static checker updates #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 15, 2018
Merged

Fixing emergent issues identified and caused by static checker updates #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6d0320
removing unnecessary print statements in basic example
mattsb42-aws Feb 14, 2018
eb894c5
bumping flake8-print minimum version to version that finally fixed th…
mattsb42-aws Feb 14, 2018
3aff031
disabling Bandit run in Travis pending resolution of https://bugs.lau…
mattsb42-aws Feb 14, 2018
35d670a
ignore pytest cache
mattsb42-aws Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ dist
docs/build
test/integration/test_values.conf
.python-version
.pytest_cache
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ matrix:
env: TOXENV=py36-accept
- python: 3.6
env: TOXENV=py36-examples
- python: 3.6
env: TOXENV=bandit
# disabling Bandit run in Travis pending resolution of https://bugs.launchpad.net/bandit/+bug/1749603
# - python: 3.6
# env: TOXENV=bandit
- python: 3.6
env: TOXENV=doc8
- python: 3.6
Expand Down
5 changes: 0 additions & 5 deletions examples/src/basic_encryption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
"""Example showing basic encryption and decryption of a value already in memory."""
from __future__ import print_function

import aws_encryption_sdk


Expand All @@ -35,7 +33,6 @@ def cycle_string(key_arn, source_plaintext, botocore_session=None):
source=source_plaintext,
key_provider=master_key_provider
)
print('Ciphertext: ', ciphertext)

# Decrypt the ciphertext
cycled_plaintext, decrypted_header = aws_encryption_sdk.decrypt(
Expand All @@ -55,5 +52,3 @@ def cycle_string(key_arn, source_plaintext, botocore_session=None):
pair in decrypted_header.encryption_context.items()
for pair in encryptor_header.encryption_context.items()
)

print('Decrypted: ', cycled_plaintext)
11 changes: 7 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
envlist =
py{27,34,35,36}-{local,integ,accept,examples},
bandit, doc8, readme, docs,
{flake8,pylint}{,-tests,-examples}
{flake8,pylint}{,-tests,-examples},
vulture

# Additional test environments:
# vulture :: Runs vulture. Prone to false-positives.
Expand All @@ -22,14 +23,15 @@ passenv =
# Identifies AWS KMS key id to use in integration tests
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID \
# Pass through AWS credentials
AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN \
# Pass through AWS profile name (useful for local testing)
AWS_PROFILE
sitepackages = False
deps =
mock
pytest>=3.3.1
pytest-cov
pytest-mock
coverage
commands =
local: pytest --cov aws_encryption_sdk -m local -l {posargs}
integ: pytest --cov aws_encryption_sdk -m integ -l {posargs}
Expand All @@ -44,7 +46,8 @@ deps =
flake8
flake8-docstrings
flake8-import-order
flake8-print>=3.0.1
# https://github.com/JBKahn/flake8-print/pull/30
flake8-print>=3.1.0
commands =
flake8 src/aws_encryption_sdk/ setup.py

Expand Down