Merge pull request #91 from DiamondLightSource/new_puck_codes

Preparation for release 1.8.0
DiamondLightSource · Jan 5, 2023 · 736b95f · 736b95f
2 parents 138c4bd + 724281a
commit 736b95f
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 34 deletions.
diff --git a/Pipfile b/Pipfile
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.8.0)](docs/release-notes/release-notes-v1_8_0.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)

diff --git a/build.bat b/build.bat
@@ -4,7 +4,7 @@ mkdir bin
 REM use to debug the exe file
 REM pyinstaller --onefile --icon=..\resources\icons\qr_code.ico --debug --clean main.py
 
-pyinstaller --onefile --windowed --icon="resources\icons\qr_code.ico" --clean "main.py"
+pyinstaller --onefile --add-binary "C:\Users\rqq82173\.virtualenvs\PuckBarcodeReader-6rTXUiM6\Lib\site-packages\pylibdmtx\libdmtx-64.dll;." --windowed --icon="resources\icons\qr_code.ico" --clean "main.py"
 
 move dist\main.exe bin\barcode.exe
 rd /S /Q build

diff --git a/dls_barcode/version.py b/dls_barcode/version.py
@@ -1 +1 @@
-VERSION = "v1.7.1"
+VERSION = "v1.8.0"
diff --git a/docs/code.md b/docs/code.md
@@ -29,7 +29,9 @@ Creating a Self-Contained Executable
 ====================================
 A Python package called [PyInstaller](http://www.pyinstaller.org/) can be used to create a stand-alone windows executable (.exe) file.
 
-Activate your virtual environment (e.g.run in command line C:\Users\rqq82173\PycharmProjects\python_environments\barcode_qt5\Scripts\activate.bat) next run the `build.bat` in PuckBarcodeReader folder. This will create the file `bin\barcode.exe`. This will be fairly large (~40 MB). 
+Activate your virtual environment (e.g.run in command line C:\Users\rqq82173\PycharmProjects\python_environments\barcode_qt5\Scripts\activate.bat) next run the `build.bat` in PuckBarcodeReader folder. 
+Note build.bat includes hardcoded path to libdmtx-64.dll - it has to be updated accordingly before running `bin\barcode.exe`.
+This will create the file `bin\barcode.exe`. This will be fairly large (~40 MB). 
 Once .exe file is created add 'resources' folder to th bin folder (resources include the icon and the shape patter). 
 Zip the bin folder and add it to release files.
 

diff --git a/docs/release-notes/release-notes-v1_8_0.md b/docs/release-notes/release-notes-v1_8_0.md
@@ -0,0 +1,17 @@
+Release Notes (Development)
+===========================
+
+Changes merged into master
+--------------------------
+| Jira Task | GitHub Issue | Type | Description                        |
+|-----------|--------------|------|------------------------------------|
+|     -     |     -        |      |Use python 3.9                      |
+|I04_1-1036 |     -        |Minor |Use pylibdtmx to read barcodes      | 
+
+Change Types:
+* Major - Backward incompatible change
+* Minor - Backward compatible change in API/functionality
+* Patch - Bug fix, no change in functionality
+
+
+
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
@@ -14,7 +14,7 @@ install_requires=
     numpy
     scipy
     pyperclip
-    pygelf
+    pylibdmtx
 # If you want to include data files in packages,
 # set this to True and include a MANIFEST.in file.
 include_package_data = False