Use new xcamera module

We no longer rely on `garden`.

Author: AndreMiras

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 
+  - Use new `xcamera` from PyPI
   - Use `opencv-python` from PyPI, refs #23
 
 ## [2019.0909]

Makefile

@@ -31,7 +31,9 @@ venv:
 virtualenv: venv
 	$(PIP) install Cython==0.28.6
 	$(PIP) install -r requirements/requirements.txt
-	$(GARDEN) install xcamera
+
+virtualenv/test: virtualenv
+	$(PIP) install -r requirements/requirements-test.txt
 
 system_dependencies:
 ifeq ($(OS), Ubuntu)
@@ -46,17 +48,16 @@ run: run/linux
 test:
 	$(TOX)
 
-uitest: virtualenv
-	$(PIP) install -r requirements/test_requirements.txt
+uitest: virtualenv/test
 	PYTHONPATH=src $(PYTHON) -m unittest discover --top-level-directory=. --start-directory=tests/ui/
 
-lint/isort-check: virtualenv
+lint/isort-check: virtualenv/test
 	$(ISORT) --check-only --recursive --diff $(SOURCES)
 
-lint/isort-fix: virtualenv
+lint/isort-fix: virtualenv/test
 	$(ISORT) --recursive $(SOURCES)
 
-lint/flake8: virtualenv
+lint/flake8: virtualenv/test
 	$(FLAKE8) $(SOURCES)
 
 lint: lint/isort-check lint/flake8

README.md

@@ -35,11 +35,6 @@ Install system requirements (Ubuntu 18.04):
 make system_dependencies
 ```
 
-Install garden requirements:
-```sh
-garden install --upgrade xcamera
-```
-
 Install zbarcam:
 ```sh
 pip install --upgrade zbarcam
@@ -65,9 +60,6 @@ make uitest
 
 ## Troubleshooting
 
-### Install `Unable to import package 'kivy.garden.xcamera.XCamera'`
-You're missing the `xcamera` dependency. Install it as described in the install instructions.
-
 ### Android `ValueError: Empty module name`
 More likely an import issue in your `.kv` file.
 Try to `from zbarcam import ZBarCam` in your `main.py` to see the exact error.

buildozer.spec

@@ -43,7 +43,8 @@ requirements =
     libzbar,
     Pillow==5.2.0,
     python3,
-    pyzbar==0.1.8
+    pyzbar==0.1.8,
+    xcamera
 
 
 # (str) Custom source folders for requirements
@@ -52,7 +53,6 @@ requirements =
 
 # (list) Garden requirements
 #garden_requirements =
-garden_requirements = xcamera
 
 # (str) Presplash of the application
 #presplash.filename = %(source.dir)s/data/presplash.png

requirements/test_requirements.txt renamed to requirements/requirements-test.txt

@@ -4,3 +4,4 @@ numpy==1.16.1
 opencv-python==4.1.1.26
 Pillow==5.2.0
 pyzbar==0.1.8
+xcamera

requirements/requirements.txt

@@ -28,6 +28,7 @@ def read(fname):
         'opencv-python>=4',
         'pillow',
         'pyzbar',
+        'xcamera',
     ],
 }
 

setup.py

@@ -3,10 +3,10 @@
 
 import PIL
 from kivy.clock import Clock, mainthread
-from kivy.garden.xcamera import XCamera
 from kivy.lang import Builder
 from kivy.properties import ListProperty
 from kivy.uix.anchorlayout import AnchorLayout
+from kivy_garden.xcamera import XCamera
 from pyzbar import pyzbar
 
 from .utils import check_request_camera_permission, fix_android_image
@@ -16,7 +16,7 @@
 
 class CustomXCamera(XCamera):
     """
-    Inherits from `kivy.garden.xcamera.XCamera`.
+    Inherits from `kivy_garden.xcamera.XCamera`.
     Overrides `_on_index()` to make sure the `kivy.core.camera.Camera` object
     is only created if permission are granted on Android.
     On other system, it's a noop calling the parent `_on_index()`.

src/kivy_garden/zbarcam/zbarcam.py

@@ -4,7 +4,6 @@
 import mock
 from kivy.base import EventLoop
 from kivy.core.image import Image
-
 from kivy_garden.zbarcam import ZBarCam
 
 FIXTURE_DIR = os.path.join(

tests/test_zbarcam.py

@@ -5,8 +5,8 @@
 
 import mock
 from kivy.clock import Clock
-
 from kivy_garden.zbarcam.zbarcam import ZBarCam
+
 from main import DemoApp