Merge branch 'release-1.17.12'

* release-1.17.12:
  Bumping version to 1.17.12
  Update changelog based on model updates
  Add bundled installer urllib3 dependency for python 3.4
  Update colorama

.changes/1.17.12.json

@@ -0,0 +1,32 @@
+[
+  {
+    "category": "``codebuild``", 
+    "description": "Update codebuild command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ebs``", 
+    "description": "Update ebs command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``lex-models``", 
+    "description": "Update lex-models command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``appsync``", 
+    "description": "Update appsync command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ecr``", 
+    "description": "Update ecr command to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.17.12
+=======
+
+* api-change:``codebuild``: Update codebuild command to latest version
+* api-change:``ec2``: Update ec2 command to latest version
+* api-change:``ebs``: Update ebs command to latest version
+* api-change:``lex-models``: Update lex-models command to latest version
+* api-change:``appsync``: Update appsync command to latest version
+* api-change:``ecr``: Update ecr command to latest version
+
+
 1.17.11
 =======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.17.11'
+__version__ = '1.17.12'
 
 #
 # Get our data path to be added to botocore's search path

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.17.'
 # The full version, including alpha/beta/rc tags.
-release = '1.17.11'
+release = '1.17.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

scripts/make-bundle

@@ -24,6 +24,9 @@ from contextlib import contextmanager
 EXTRA_RUNTIME_DEPS = [
     # Use an up to date virtualenv/pip/setuptools on > 2.6.
     ('virtualenv', '16.7.8'),
+    # The following is for python 3.4 compatibility.
+    ('colorama', '0.4.1'),
+    ('urllib3', '1.25.7'),
 ]
 BUILDTIME_DEPS = [
     ('setuptools-scm', '3.3.3'),

setup.cfg

@@ -4,12 +4,13 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.14.11
-        colorama>=0.2.5,<0.4.2
+        botocore==1.14.12
         docutils>=0.10,<0.16
         rsa>=3.1.2,<=3.5.0
         PyYAML>=3.10,<5.3
         s3transfer>=0.3.0,<0.4.0
+        colorama>=0.2.5,<0.4.2; python_version=='3.4'
+        colorama>=0.2.5,<0.4.4; python_version!='3.4'
 
 
 [check-manifest]

setup.py

@@ -23,12 +23,19 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-install_requires = ['botocore==1.14.11',
-                    'docutils>=0.10,<0.16',
-                    'rsa>=3.1.2,<=3.5.0',
-                    's3transfer>=0.3.0,<0.4.0',
-                    'PyYAML>=3.10,<5.3',
-                    'colorama>=0.2.5,<0.4.2']
+install_requires = [
+    'botocore==1.14.12',
+    'docutils>=0.10,<0.16',
+    'rsa>=3.1.2,<=3.5.0',
+    's3transfer>=0.3.0,<0.4.0',
+    'PyYAML>=3.10,<5.3',
+]
+
+
+if sys.version_info[:2] == (3, 4):
+    install_requires.append('colorama>=0.2.5,<0.4.2')
+else:
+    install_requires.append('colorama>=0.2.5,<0.4.4')
 
 
 setup_options = dict(