From 681726b82679dadefbbba2f30f267ac0c754eeb4 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 27 Dec 2017 11:08:09 -0800
Subject: [PATCH 1/9] Including the in-source version number

---
 moto/__init__.py     | 2 +-
 scripts/bump_version | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/moto/__init__.py b/moto/__init__.py
index 3508dfeda..9d292a3e1 100644
--- a/moto/__init__.py
+++ b/moto/__init__.py
@@ -3,7 +3,7 @@ import logging
 # logging.getLogger('boto').setLevel(logging.CRITICAL)
 
 __title__ = 'moto'
-__version__ = '1.0.1'
+__version__ = '1.2.0',
 
 from .acm import mock_acm  # flake8: noqa
 from .apigateway import mock_apigateway, mock_apigateway_deprecated  # flake8: noqa
diff --git a/scripts/bump_version b/scripts/bump_version
index fe7ec1970..b5dc43562 100755
--- a/scripts/bump_version
+++ b/scripts/bump_version
@@ -17,7 +17,7 @@ main() {
 
   git checkout -b version-${version}
   # Commit the new version
-  git commit setup.py -m "bumping to version ${version}"
+  git commit setup.py moto/__init__.py -m "bumping to version ${version}"
   # Commit an updated IMPLEMENTATION_COVERAGE.md
   make implementation_coverage || true
   # Open a PR

From fbaca6a130a232d9c1b49b37633b334675befd30 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 27 Dec 2017 11:12:47 -0800
Subject: [PATCH 2/9] Updating CHANGELOG for 1.2.0

---
 CHANGELOG.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b10967f64..15ddbec45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 Moto Changelog
 ===================
 
-Latest
+1.2.0
 ------
+
     * Implemented signal_workflow_execution for SWF
     * Wired SWF backend to the moto server
-    * Fixed incorrect handling of task list parameter on start_workflow_execution
+    * Revamped lambda function storage to do versioning
+    * IOT improvements
+    * RDS improvements
+    * Implemented CloudWatch get_metric_statistics
+    * Improved Cloudformation EC2 support
+    * Implemented Cloudformation change_set endpoints
     
 1.1.25
 -----

From c348fd25018589d7a964ea011e108c80e3775203 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:01:40 -0800
Subject: [PATCH 3/9] Adding .bumpversion.cfg

---
 .bumpversion.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .bumpversion.cfg

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 000000000..b775ca46c
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,8 @@
+[bumpversion]
+current_version = 1.1.25
+
+[bumpversion:file:setup.py]
+
+[bumpversion:file:moto/__init__.py]
+
+[bumpversion:file:setup.cfg]

From 38711b398cc148c350a2eeb0545562a80178aaf0 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:02:41 -0800
Subject: [PATCH 4/9] bringing old version number into line

---
 moto/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moto/__init__.py b/moto/__init__.py
index 9d292a3e1..12a4edc6d 100644
--- a/moto/__init__.py
+++ b/moto/__init__.py
@@ -3,7 +3,7 @@ import logging
 # logging.getLogger('boto').setLevel(logging.CRITICAL)
 
 __title__ = 'moto'
-__version__ = '1.2.0',
+__version__ = '1.1.25',
 
 from .acm import mock_acm  # flake8: noqa
 from .apigateway import mock_apigateway, mock_apigateway_deprecated  # flake8: noqa

From 85e0e2d2c0b962768a750edb01f7aa27e2074f0e Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:03:04 -0800
Subject: [PATCH 5/9] not committing version to setup.cfg

---
 .bumpversion.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index b775ca46c..add9882e0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -5,4 +5,3 @@ current_version = 1.1.25
 
 [bumpversion:file:moto/__init__.py]
 
-[bumpversion:file:setup.cfg]

From 24fee6726af5ebc85bb66e6fd9f390feff41b9d2 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:04:32 -0800
Subject: [PATCH 6/9] bumping version to 1.2.0

---
 .bumpversion.cfg | 2 +-
 moto/__init__.py | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index add9882e0..32a01af8f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.25
+current_version = 1.2.0
 
 [bumpversion:file:setup.py]
 
diff --git a/moto/__init__.py b/moto/__init__.py
index 12a4edc6d..9d292a3e1 100644
--- a/moto/__init__.py
+++ b/moto/__init__.py
@@ -3,7 +3,7 @@ import logging
 # logging.getLogger('boto').setLevel(logging.CRITICAL)
 
 __title__ = 'moto'
-__version__ = '1.1.25',
+__version__ = '1.2.0',
 
 from .acm import mock_acm  # flake8: noqa
 from .apigateway import mock_apigateway, mock_apigateway_deprecated  # flake8: noqa
diff --git a/setup.py b/setup.py
index 201622627..27c635944 100755
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ else:
 
 setup(
     name='moto',
-    version='1.1.25',
+    version='1.2.0',
     description='A library that allows your python tests to easily'
                 ' mock out the boto library',
     author='Steve Pulec',

From 58c37c6fdfc1cabca09f956792caa5237164f4f5 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:06:32 -0800
Subject: [PATCH 7/9] using bumpversion package for scripts/bumpversion

---
 scripts/bump_version | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/bump_version b/scripts/bump_version
index b5dc43562..5315f26f0 100755
--- a/scripts/bump_version
+++ b/scripts/bump_version
@@ -10,10 +10,8 @@ main() {
     return 1
   fi
 
-  # TODO: replace this with the bumpversion pip package, I couldn't
-  # figure out how to use that for these files
-  sed -i '' "s/version=.*$/version='${version}',/g" setup.py
-  sed -i '' "s/__version__ = .*$/__version__ = '${version}',/g" moto/__init__.py
+  &>/dev/null which bumpversion || pip install bumpversion
+  bumpversion --new-version ${version} patch
 
   git checkout -b version-${version}
   # Commit the new version

From 021303a2af40fc648975cdfc3e2393178ab70add Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:07:40 -0800
Subject: [PATCH 8/9] simplifying committing of changed versioned files

---
 scripts/bump_version | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/bump_version b/scripts/bump_version
index 5315f26f0..d1af3a84b 100755
--- a/scripts/bump_version
+++ b/scripts/bump_version
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 main() {
+  set -euo pipefail  # Bash safemode
+
   local version=$1
   if [[ -z "${version}" ]]; then
     echo "USAGE: $0 1.3.2"
@@ -15,7 +17,7 @@ main() {
 
   git checkout -b version-${version}
   # Commit the new version
-  git commit setup.py moto/__init__.py -m "bumping to version ${version}"
+  git commit -a -m "bumping to version ${version}"
   # Commit an updated IMPLEMENTATION_COVERAGE.md
   make implementation_coverage || true
   # Open a PR

From 738dc083c813857d565ea823ba0ca7754a0e4632 Mon Sep 17 00:00:00 2001
From: Jack Danger <github@jackcanty.com>
Date: Wed, 10 Jan 2018 15:32:16 -0800
Subject: [PATCH 9/9] updating CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15ddbec45..4dac737b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Moto Changelog
 1.2.0
 ------
 
+    * Supports filtering AMIs by self
     * Implemented signal_workflow_execution for SWF
     * Wired SWF backend to the moto server
     * Revamped lambda function storage to do versioning