Merge branch 'release/20190223'

Author: AndreMiras

CHANGELOG.md

@@ -1,20 +1,25 @@
 # Change Log
 
+## [20190223]
+
+  - Fix zbarlight dependency in setup.py, refs #28
+  - Migrate to zbarlight 2.1, refs #18
+
 ## [20190222]
 
- - Provide Makefile, refs #15
- - Setup continuous integration testing, refs #6, #14
- - Speedup OpenCV compilation time, refs #16
- - Migrated to zbarlight, refs #5, #13
- - Introduced UI tests, refs #4
- - Using non-root Docker container, refs #27
- - Run UI tests from Travis, refs #26
+  - Provide Makefile, refs #15
+  - Setup continuous integration testing, refs #6, #14
+  - Speedup OpenCV compilation time, refs #16
+  - Migrated to zbarlight, refs #5, #13
+  - Introduced UI tests, refs #4
+  - Using non-root Docker container, refs #27
+  - Run UI tests from Travis, refs #26
 
 ## [20171220]
 
- - Full screen camera
- - Kvlang refactoring
- - File tree refactoring
+  - Full screen camera
+  - Kvlang refactoring
+  - File tree refactoring
 
 ## [20171117]
 

Makefile

@@ -57,4 +57,4 @@ test:
 
 uitest: virtualenv
 	$(PIP) install -r requirements/test_requirements.txt
-	$(PYTHON) -m unittest discover --top-level-directory=. --start-directory=tests/
+	$(PYTHON) -m unittest discover --top-level-directory=. --start-directory=tests/ui/

README.md

@@ -20,7 +20,7 @@ BoxLayout:
     Label:
         size_y: 20
         size_hint_y: None
-        text: ", ".join([str(symbol.data) for symbol in zbarcam.symbols])
+        text: ", ".join([str(code) for code in zbarcam.codes])
 ```
 
 ## Install

__init__.py

@@ -38,7 +38,7 @@ version.filename = %(source.dir)s/zbarcam/version.py
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = kivy, pil, libiconv, libzbar, zbarlight==1.2
+requirements = kivy, pil, libiconv, libzbar, zbarlight>=2.1
 
 
 # (str) Custom source folders for requirements

buildozer.spec

@@ -1,4 +1,4 @@
-zbarlight==1.2
+zbarlight==2.2
 Kivy==1.10.1
 Kivy-Garden==0.1.4
 Pillow==4.3.0

requirements/requirements.txt

@@ -1,3 +1,4 @@
 isort==4.2.5
 flake8==3.3.0
 mock==2.0.0
+pytest==4.3.0

requirements/test_requirements.txt

@@ -9,4 +9,4 @@
       url='https://github.com/AndreMiras/garden.zbarcam',
       packages=['zbarcam'],
       package_data={'zbarcam': ['*.kv']},
-      install_requires=['zbar', 'kivy', 'pillow', 'numpy'])
+      install_requires=['zbarlight>=2.1', 'kivy', 'pillow', 'numpy'])