Merge pull request #233 from escapewindow/12_1_0

12.1.0
mozilla-releng · Jun 6, 2018 · a7a5b6f · a7a5b6f
2 parents dd7b974 + 3e72dfd
commit a7a5b6f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -1,8 +1,8 @@
 {
     "version": [
         12,
-        0,
-        1
+        1,
+        0
     ],
-    "version_string": "12.0.1"
+    "version_string": "12.1.0"
 }