Merge pull request #61 from DiamondLightSource/release_v1.2.0

Release v1.2.0

Author: UrszulaNeuman

README.md

@@ -29,5 +29,6 @@ This section serves as an introduction for developers who are interested in main
 Release Notes
 -------------
 * [ReleaseNotes (development)](docs/release-notes/release-notes-dev.md)
+* [ReleaseNotes (v1.2.0)](docs/release-notes/release-notes-v1_2_0.md)
 * [ReleaseNotes (v1.1.0)](docs/release-notes/release-notes-v1_1_0.md)
 * [ReleaseNotes (v1.0.0)](docs/release-notes/release-notes-v1_0_0.md)

dls_barcode/version.py

@@ -1 +1 @@
-VERSION = "vX.x.p"
+VERSION = "v1.2.0"

docs/release-notes/release-notes-dev.md

@@ -5,11 +5,6 @@ Changes merged into master
 --------------------------
 | Jira Task | GitHub Issue | Type | Description |
 |-----------|--------------|------|-------------|
-| I04_1-274 | [#52](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/52) | Patch | Fixed system tests |
-| I04_1-272 | [#54](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/54) | Patch | Fixed cammera settings button|
-| I04_1-162 | [#56](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/56) | Patch | Fixed slow Travis build|
-| I04_1-268 | [#58](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/58) | Minor | Imporved the puck orientation algorithm|
-| I04_1-270 | [#59](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/59) | Minor | Improved the puck orientation algorithm - should work even for one pin|
 
 
 Change Types:

docs/release-notes/release-notes-v1_2_0.md

@@ -0,0 +1,19 @@
+Release Notes (v1.2.0)
+===========================
+
+Summary of all changes
+----------------------
+| Jira Task | GitHub Issue | Type | Description |
+|-----------|--------------|------|-------------|
+| I04_1-274 | [#52](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/52) | Patch | Fixed system tests |
+| I04_1-272 | [#54](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/54) | Patch | Fixed cammera settings button|
+| I04_1-162 | [#56](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/56) | Patch | Fixed slow Travis build|
+| I04_1-268 | [#58](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/58) | Minor | Imporved the puck orientation algorithm|
+| I04_1-270 | [#59](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/59) | Minor | Improved the puck orientation algorithm - should work even for one pin|
+
+
+Change Types:
+* Major - Backward incompatible change
+* Minor - Backward compatible change in API/functionality
+* Patch - Bug fix, no change in functionality
+