diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b46c4d4..a3d28aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [12.1.0] - 2018-06-05 +### Changed +- added `loop_function` kwarg to `sync_main` for testing + +### Fixed +- fixed tests against aiohttp 3.3.0 +- fixed concurrent test intermittent errors + ## [12.0.1] - 2018-05-31 ### Fixed - fixed `mobile` `prebuilt_docker_image_task_types` diff --git a/scriptworker/version.py b/scriptworker/version.py index bd855d83..f557c337 100755 --- a/scriptworker/version.py +++ b/scriptworker/version.py @@ -52,7 +52,7 @@ def get_version_string(version): # 1}}} # Semantic versioning 2.0.0 http://semver.org/ -__version__ = (12, 0, 1) +__version__ = (12, 1, 0) __version_string__ = get_version_string(__version__) diff --git a/version.json b/version.json index 7826ae4b..ae58db5f 100644 --- a/version.json +++ b/version.json @@ -1,8 +1,8 @@ { "version": [ 12, - 0, - 1 + 1, + 0 ], - "version_string": "12.0.1" + "version_string": "12.1.0" } \ No newline at end of file