chore: merge pull request #244 from mattsb42-aws/keyring-master-merge

chore: merge master into keyring

CONTRIBUTING.md

@@ -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.
@@ -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.

README.rst

@@ -30,6 +30,8 @@ The latest full documentation can be found at `Read the Docs`_.
 
 Find us on `GitHub`_.
 
+`Security issue notifications`_
+
 ***************
 Getting Started
 ***************
@@ -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

tox.ini

@@ -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