From 1922c4a7d1e06ff039ccf0ddececf69a3b3a7d43 Mon Sep 17 00:00:00 2001 From: awstools Date: Mon, 24 Jul 2017 13:30:47 -0700 Subject: [PATCH] Bumping version to 1.11.124 --- .changes/1.11.124.json | 12 ++++++++++++ .changes/next-release/api-change-appstream-1966.json | 5 ----- .changes/next-release/api-change-ec2-18057.json | 5 ----- CHANGELOG.rst | 7 +++++++ awscli/__init__.py | 2 +- doc/source/conf.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 8 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 .changes/1.11.124.json delete mode 100644 .changes/next-release/api-change-appstream-1966.json delete mode 100644 .changes/next-release/api-change-ec2-18057.json diff --git a/.changes/1.11.124.json b/.changes/1.11.124.json new file mode 100644 index 000000000000..b1a68d633068 --- /dev/null +++ b/.changes/1.11.124.json @@ -0,0 +1,12 @@ +[ + { + "category": "``ec2``", + "description": "Update ec2 command to latest version", + "type": "api-change" + }, + { + "category": "``appstream``", + "description": "Update appstream command to latest version", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-appstream-1966.json b/.changes/next-release/api-change-appstream-1966.json deleted file mode 100644 index 43c322de2ca6..000000000000 --- a/.changes/next-release/api-change-appstream-1966.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "category": "``appstream``", - "type": "api-change", - "description": "Update appstream command to latest version" -} diff --git a/.changes/next-release/api-change-ec2-18057.json b/.changes/next-release/api-change-ec2-18057.json deleted file mode 100644 index db9cb4381242..000000000000 --- a/.changes/next-release/api-change-ec2-18057.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "category": "``ec2``", - "type": "api-change", - "description": "Update ec2 command to latest version" -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 46bab8806593..f2413c6a8c35 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ CHANGELOG ========= +1.11.124 +======== + +* api-change:``ec2``: Update ec2 command to latest version +* api-change:``appstream``: Update appstream command to latest version + + 1.11.123 ======== diff --git a/awscli/__init__.py b/awscli/__init__.py index a6f4d61a8c2c..a6beb089fe5b 100644 --- a/awscli/__init__.py +++ b/awscli/__init__.py @@ -17,7 +17,7 @@ """ import os -__version__ = '1.11.123' +__version__ = '1.11.124' # # Get our data path to be added to botocore's search path diff --git a/doc/source/conf.py b/doc/source/conf.py index 3ab1379da203..e8c2b29e521c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -52,7 +52,7 @@ # The short X.Y version. version = '1.11.1' # The full version, including alpha/beta/rc tags. -release = '1.11.123' +release = '1.11.124' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.cfg b/setup.cfg index af2722fc9bc4..8e1a731db797 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ universal = 1 [metadata] requires-dist = - botocore==1.5.86 + botocore==1.5.87 colorama>=0.2.5,<=0.3.7 docutils>=0.10 rsa>=3.1.2,<=3.5.0 diff --git a/setup.py b/setup.py index 57d2a0daa8fa..e028a5fb3ca4 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ def find_version(*file_paths): raise RuntimeError("Unable to find version string.") -requires = ['botocore==1.5.86', +requires = ['botocore==1.5.87', 'colorama>=0.2.5,<=0.3.7', 'docutils>=0.10', 'rsa>=3.1.2,<=3.5.0',