Merge remote-tracking branch 'spulec/moto/master' into organizations_…

…support

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.3
+current_version = 1.3.4
 
 [bumpversion:file:setup.py]
 

.travis.yml

@@ -8,6 +8,19 @@ python:
 env:
  - TEST_SERVER_MODE=false
  - TEST_SERVER_MODE=true
+# Due to incomplete Python 3.7 support on Travis CI (
+# https://github.com/travis-ci/travis-ci/issues/9815),
+# using a matrix is necessary
+matrix:
+ include:
+ - python: 3.7
+ env: TEST_SERVER_MODE=false
+ dist: xenial
+ sudo: true
+ - python: 3.7
+ env: TEST_SERVER_MODE=true
+ dist: xenial
+ sudo: true
 before_install:
  - export BOTO_CONFIG=/dev/null
 install:

AUTHORS.md

@@ -53,3 +53,4 @@ Moto is written by Steve Pulec with contributions from:
 * [Jim Shields](https://github.com/jimjshields)
 * [William Richard](https://github.com/william-richard)
 * [Alex Casalboni](https://github.com/alexcasalboni)
+* [Jon Beilke](https://github.com/jrbeilke)

CHANGELOG.md

@@ -1,6 +1,25 @@
 Moto Changelog
 ===================
 
+1.3.6
+-----
+
+ * Fix boto3 pinning.
+
+1.3.5
+-----
+
+ * Pin down botocore issue as temporary fix for #1793.
+ * More features on secrets manager
+
+1.3.4
+------
+
+ * IAM get account authorization details
+ * adding account id to ManagedPolicy ARN
+ * APIGateway usage plans and usage plan keys
+ * ECR list images
+
 1.3.3
 ------