Updated version number and release notes for v1.1.0

DiamondLightSource · Dec 18, 2017 · db65552 · db65552
1 parent b36dd3e
commit db65552
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -29,4 +29,5 @@ 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.1.0)](docs/release-notes/release-notes-v1_1_0.md)
 * [ReleaseNotes (v1.0.0)](docs/release-notes/release-notes-v1_0_0.md)
diff --git a/dls_barcode/version.py b/dls_barcode/version.py
@@ -1 +1 @@
-VERSION = "vX.x.p"
+VERSION = "v1.1.0"
diff --git a/docs/release-notes/release-notes-dev.md b/docs/release-notes/release-notes-dev.md
@@ -5,10 +5,6 @@ Changes merged into master
 --------------------------
 | Jira Task | GitHub Issue | Type | Description |
 |-----------|--------------|------|-------------|
-| I04_1-167 | [#44](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/44) | Minor | Added version number display |
-| I04_1-152 | [#48](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/48) | Patch | Fixed missing icons |
-| I04_1-177 | [#46](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/46) | Minor | Allow records for duplicate holder barcodes |
-| I04_1-165 | [#47](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/47) | Minor | Display holder barcode in records table |
 
 
 

diff --git a/docs/release-notes/release-notes-v1_1_0.md b/docs/release-notes/release-notes-v1_1_0.md
@@ -0,0 +1,18 @@
+Release Notes (v1.1.0)
+===========================
+
+Summary of all changes
+----------------------
+| Jira Task | GitHub Issue | Type | Description |
+|-----------|--------------|------|-------------|
+| I04_1-167 | [#44](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/44) | Minor | Added version number display |
+| I04_1-152 | [#48](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/48) | Patch | Fixed missing icons |
+| I04_1-177 | [#46](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/46) | Minor | Allow records for duplicate holder barcodes |
+| I04_1-165 | [#47](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/47) | Minor | Display holder barcode in records table |
+
+
+Change Types:
+* Major - Backward incompatible change
+* Minor - Backward compatible change in API/functionality
+* Patch - Bug fix, no change in functionality
+