Merge branch 'master' of https://github.com/DiamondLightSource/PuckBarcodeReader into new_puck_codes

UrszulaNeuman · UrszulaNeuman · commit 138c4bdffad1 · 2022-12-19T11:46:22.000Z
diff --git a/Pipfile b/Pipfile
@@ -14,16 +14,15 @@ pytest-cov = "*"
 pytest-mypy = "*"
 pytest-flake8 = "*"
 isort = "*"
-pyinstaller = "*"
 
 [packages]
 pygelf = "*"
-opencv-python = "*"
 pyperclip = "*"
 scipy = "*"
 numpy = "*"
 pytest-isort = "*"
-pyqt5 = "*"
+pyinstaller = "<5"
+opencv-python = "<4.6"
 pylibdmtx = "*"
 
 [scripts]
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ 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.7.1)](docs/release-notes/release-notes-v1_7_1.md)
 * [ReleaseNotes (v1.7.0)](docs/release-notes/release-notes-v1_7_0.md)
 * [ReleaseNotes (v1.6.0)](docs/release-notes/release-notes-v1_6_0.md)
 * [ReleaseNotes (v1.5.0)](docs/release-notes/release-notes-v1_5_0.md)
diff --git a/dls_barcode/version.py b/dls_barcode/version.py
@@ -1 +1 @@
-VERSION = "v1.7.0"
+VERSION = "v1.7.1"
diff --git a/docs/release-notes/release-notes-v1_7_1.md b/docs/release-notes/release-notes-v1_7_1.md
@@ -0,0 +1,16 @@
+Release Notes (Development)
+===========================
+
+Changes merged into master
+--------------------------
+| Jira Task | GitHub Issue | Type | Description                           |
+|-----------|--------------|------|---------------------------------------|
+|I04_1-1014 |     -        |Patch | Use blank image when no image is found|  
+
+Change Types:
+* Major - Backward incompatible change
+* Minor - Backward compatible change in API/functionality
+* Patch - Bug fix, no change in functionality
+
+
+
diff --git a/main.py b/main.py
@@ -37,7 +37,7 @@ def main(config_file, version):
     log.debug(version)
     app = QtWidgets.QApplication(sys.argv)
     config = BarcodeConfig(config_file, FileManager())
-    ui = DiamondBarcodeMainWindow(config, 'version', None)
+    ui = DiamondBarcodeMainWindow(config, VERSION, None)
     
    
     ui.set_actions_triger()

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-VERSION = "v1.7.0"`
	`1`	`+VERSION = "v1.7.1"`