Merge pull request #1412 from JackDanger/version-1.2.0

releasing version 1.2.0

.bumpversion.cfg

@@ -0,0 +1,7 @@
+[bumpversion]
+current_version = 1.2.0
+
+[bumpversion:file:setup.py]
+
+[bumpversion:file:moto/__init__.py]
+

CHANGELOG.md

@@ -1,11 +1,18 @@
 Moto Changelog
 ===================
 
-Latest
+1.2.0
 ------
+
+    * Supports filtering AMIs by self
     * 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
 -----

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

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"
@@ -10,14 +12,12 @@ 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
-  git commit setup.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

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',