Merge branch 'release-1.15.6'

* release-1.15.6:
  Bumping version to 1.15.6
  Update changelog based on model updates
  Update make bundle minimum versions
  Revert "Revert "Use --no-download for creating bundled installer""

.changes/1.15.6.json

@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``medialive``", 
+    "description": "Update medialive command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``firehose``", 
+    "description": "Update firehose command to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.15.6
+======
+
+* api-change:``medialive``: Update medialive command to latest version
+* api-change:``firehose``: Update firehose command to latest version
+
+
 1.15.5
 ======
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.15.5'
+__version__ = '1.15.6'
 
 #
 # 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.15'
 # The full version, including alpha/beta/rc tags.
-release = '1.15.5'
+release = '1.15.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

scripts/make-bundle

@@ -94,7 +94,7 @@ def download_cli_deps(scratch_dir):
     # Step one create a virtualenv.
     venv_dir = tempfile.mkdtemp()
     try:
-        run('virtualenv %s' % venv_dir)
+        run('virtualenv --no-download  %s' % venv_dir)
         pip = os.path.join(venv_dir, 'bin', 'pip')
         assert os.path.isfile(pip)
         awscli_dir = os.path.dirname(
@@ -152,8 +152,8 @@ def verify_preconditions():
     pip_version = run('pip --version').strip().split()[1]
     # Virtualenv version just has the version string: '1.14.5\n'
     virtualenv_version = run('virtualenv --version').strip()
-    _min_version_required('1.5.0', pip_version, 'pip')
-    _min_version_required('1.11.4', virtualenv_version, 'virtualenv')
+    _min_version_required('9.0.1', pip_version, 'pip')
+    _min_version_required('15.1.0', virtualenv_version, 'virtualenv')
 
 
 def _min_version_required(min_version, actual_version, name):
@@ -162,7 +162,7 @@ def _min_version_required(min_version, actual_version, name):
     min_split = min_version.split('.')
     actual_split = actual_version.decode('utf-8').split('.')
     for min_version_part, actual_version_part in zip(min_split, actual_split):
-        if int(actual_version_part) > int(min_version_part):
+        if int(actual_version_part) >= int(min_version_part):
             return
     raise ValueError("%s requires at least version %s, but version %s was "
                      "found." % (name, min_version, actual_version))

setup.cfg

@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.10.5
+        botocore==1.10.6
         colorama>=0.2.5,<=0.3.7
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

setup.py

@@ -23,7 +23,7 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-requires = ['botocore==1.10.5',
+requires = ['botocore==1.10.6',
             'colorama>=0.2.5,<=0.3.7',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',