Skip to content

chore: merge master into keyring #244

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 22 commits into from
Apr 10, 2020
Merged

chore: merge master into keyring #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0938325
Update PR template
johnwalker Jul 15, 2019
ee1b4cc
Added a check for max_age being greater than 0 (#172)
caitlin-tibbetts Jul 22, 2019
9351933
Merge branch 'master' into prtemplate
mattsb42-aws Jul 22, 2019
d3383c6
Merge pull request #171 from johnwalker/prtemplate
johnwalker Jul 23, 2019
1de8d5c
Fixed KMS master key provider tests when default AWS region is config…
ragona Aug 2, 2019
baf1164
Wrote example and test for using one kms cmk with an unsigned algorithm
caitlin-tibbetts Aug 2, 2019
d89e6dc
Merge branch 'master' into a2b1c1-example
caitlin-tibbetts Aug 2, 2019
3af7795
Merge branch 'master' of github.com:aws/aws-encryption-sdk-python int…
caitlin-tibbetts Aug 2, 2019
a7fcb4a
Update one_kms_cmk_unsigned.py
caitlin-tibbetts Aug 6, 2019
862734a
Update examples/src/one_kms_cmk_unsigned.py
caitlin-tibbetts Aug 6, 2019
850d8c9
Merge branch 'a2b1c1-example' of github.com:caitlin-tibbetts/aws-encr…
caitlin-tibbetts Aug 6, 2019
4def8ba
isort-check now succeeds
caitlin-tibbetts Aug 7, 2019
f00fdd2
Merge pull request #180 from caitlin-tibbetts/a2b1c1-example
lizroth Aug 14, 2019
7ef7aa2
[issue-190] Regional clients modify default botocore session (#193)
polamayster Sep 20, 2019
4fa42f2
update changelog with changes for 1.4.1 release
mattsb42-aws Sep 20, 2019
e5dc675
bump version to 1.4.1
mattsb42-aws Sep 20, 2019
6a309ed
Merge pull request #194 from mattsb42-aws/141
mattsb42-aws Sep 20, 2019
0f4dc6e
Updates to handle new pylint requirements (#196)
mattsb42-aws Oct 3, 2019
7498baf
update flake8-docstrings to minimum version of 1.5.0 to address compa…
mattsb42-aws Jan 16, 2020
42dfdfe
chore: Update security issue notification (#237)
seebees Apr 10, 2020
c733b7a
Merge branch 'master' into keyring
mattsb42-aws Apr 10, 2020
9cc19b1
chore: remove example collected from merge from master
mattsb42-aws Apr 10, 2020
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
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ Please read through this document before submitting any issues or pull requests
information to effectively respond to your bug report or contribution.


## Security issue notifications
If you discover a potential security issue in this project, notify AWS/Amazon Security by using our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.


## Reporting Bugs/Feature Requests

We welcome you to use the GitHub issue tracker to report bugs or suggest features.
Expand Down Expand Up @@ -50,10 +54,6 @@ For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of
opensource-codeofconduct@amazon.com with any additional questions or comments.


## Security issue notifications
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.


## Licensing

See the [LICENSE](https://github.com/aws/aws-encryption-sdk-python/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
Expand Down
3 changes: 3 additions & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ The latest full documentation can be found at `Read the Docs`_.

Find us on `GitHub`_.

`Security issue notifications`_

***************
Getting Started
***************
Expand Down Expand Up @@ -115,3 +117,4 @@ to your use-case in order to obtain peak performance.
.. _final message: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/message-format.html
.. _encryption context: https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context
.. _examples: https://github.com/aws/aws-encryption-sdk-python/tree/master/examples
.. _Security issue notifications: ./CONTRIBUTING.md#security-issue-notifications
3 changes: 1 addition & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ commands = {[testenv:test-upstream-requirements-base]commands}
basepython = python3
deps =
flake8
flake8-docstrings
pydocstyle<4.0.0
flake8-docstrings>=1.5.0
# https://github.com/JBKahn/flake8-print/pull/30
flake8-print>=3.1.0
flake8-bugbear
Expand Down