Merge branch 'ci' into 'dev'

CI

See merge request objectbox/objectbox-python!1

Author: Ivan

.gitlab-ci.yml

@@ -0,0 +1,68 @@
+stages:
+  - build
+  - test
+
+before_script:
+  - pip3 install virtualenv pytest
+
+build:
+  image: python:latest
+  stage: build
+  script:
+    # a function to download a library from another Gitlab repos CI artifacts
+    - 'download_library(){ curl --create-dirs -o objectbox/lib/$1 -H "PRIVATE-TOKEN: $CI_API_TOKEN" $2; }'
+    - 'download_library x86_64/libobjectbox.so "${OBXLIB_URL_Linux64}"'
+    - 'download_library x86_64/libobjectbox.dylib "${OBXLIB_URL_Mac64}"'
+    - 'download_library armv7l/libobjectbox.so "${OBXLIB_URL_LinuxARMv7hf}"'
+    - 'download_library armv6l/libobjectbox.so "${OBXLIB_URL_LinuxARMv6hf}"'
+    - make test
+    - make build
+  artifacts:
+    expire_in: 1 days
+    paths:
+      - dist/*.whl
+
+.test:
+  stage: test
+  script:
+    - rm -r objectbox
+    - pip3 install --force-reinstall dist/*.whl
+    - python3 -m pytest
+
+.test:linux:x64:
+  extends: .test
+  tags: [x64, docker, linux]
+
+test:linux:x64:3.4:
+  extends: .test:linux:x64
+  image: python:3.4
+
+test:linux:x64:3.5:
+  extends: .test:linux:x64
+  image: python:3.5
+
+test:linux:x64:3.6:
+  extends: .test:linux:x64
+  image: python:3.6
+
+test:linux:x64:3.7:
+  extends: .test:linux:x64
+  image: python:3.7
+
+test:linux:x64:3.8:
+  extends: .test:linux:x64
+  image: python:3.8-rc
+
+test:linux:armv6hf:
+  extends: .test
+  tags: [armv6hf, docker, linux]
+  image: balenalib/raspberry-pi-python:3.7-stretch
+
+test:linux:armv7hf:
+  extends: .test
+  tags: [armv7hf, docker, linux]
+  image: python:3.7
+
+test:mac:x64:
+  extends: .test
+  tags: [mac, x64, shell, python3]

Makefile

@@ -9,19 +9,19 @@ ${VENV}: ${VENV}/bin/activate
 ${VENV}/bin/activate: requirements.txt
 	test -d ${VENV} || virtualenv ${VENV}
 	# remove packages not in the requirements.txt
-	pip freeze | grep -v -f requirements.txt - | grep -v '^#' | grep -v '^-e ' | xargs pip uninstall -y || echo "never mind"
+	pip3 freeze | grep -v -f requirements.txt - | grep -v '^#' | grep -v '^-e ' | xargs pip3 uninstall -y || echo "never mind"
     # install and upgrade based on the requirements.txt
-	pip install --upgrade -r requirements.txt
+	pip3 install --upgrade -r requirements.txt
 	# let make know this is the last time requirements changed
 	touch ${VENV}/bin/activate
 
 init: ${VENV}
 
 test: ${VENV}
-	python -m pytest -s
+	python3 -m pytest -s
 
 build: ${VENV} clean
-	python setup.py bdist_wheel
+	python3 setup.py bdist_wheel
 	ls -lh dist
 
 clean:

objectbox/c.py

@@ -182,20 +182,23 @@ class CoreException(Exception):
     def __init__(self, code):
         self.code = code
         self.message = py_str(C.obx_last_error_message())
-        super(CoreException, self).__init__("%d (%s) - %s" % (code, self.codes[code], self.message))
+        name = self.codes[code] if code in self.codes else "n/a"
+        super(CoreException, self).__init__("%d (%s) - %s" % (code, name, self.message))
 
 
-class NotFoundException(CoreException):
+class NotFoundException(Exception):
     pass
 
 
 # assert the the returned obx_err is empty
-def check_obx_err(code: obx_err, func, args):
+def check_obx_err(code: obx_err, func, args) -> obx_err:
     if code == 404:
-        raise NotFoundException(code)
+        raise NotFoundException()
     elif code != 0:
         raise CoreException(code)
 
+    return code
+
 
 # assert that the returned pointer/int is non-empty
 def check_result(result, func, args):
@@ -208,13 +211,15 @@ def check_result(result, func, args):
 def fn(name: str, restype: type, argtypes):
     func = C.__getattr__(name)
 
+    func.argtypes = argtypes
+    func.restype = restype
+
     if restype is obx_err:
         func.errcheck = check_obx_err
+        pass
     elif restype is not None:
         func.errcheck = check_result
-        func.restype = restype
 
-    func.argtypes = argtypes
     return func
 
 
@@ -250,13 +255,13 @@ def c_voidp_as_bytes(voidp, size):
 obx_model_property_flags = fn('obx_model_property_flags', obx_err, [OBX_model_p, OBXPropertyFlags])
 
 # obx_err (OBX_model*, obx_schema_id entity_id, obx_uid entity_uid);
-obx_model_last_entity_id = fn('obx_model_last_entity_id', obx_err, [OBX_model_p, obx_schema_id, obx_uid])
+obx_model_last_entity_id = fn('obx_model_last_entity_id', None, [OBX_model_p, obx_schema_id, obx_uid])
 
 # obx_err (OBX_model* model, obx_schema_id index_id, obx_uid index_uid);
-obx_model_last_index_id = fn('obx_model_last_index_id', obx_err, [OBX_model_p, obx_schema_id, obx_uid])
+obx_model_last_index_id = fn('obx_model_last_index_id', None, [OBX_model_p, obx_schema_id, obx_uid])
 
 # obx_err (OBX_model* model, obx_schema_id relation_id, obx_uid relation_uid);
-obx_model_last_relation_id = fn('obx_model_last_relation_id', obx_err, [OBX_model_p, obx_schema_id, obx_uid])
+obx_model_last_relation_id = fn('obx_model_last_relation_id', None, [OBX_model_p, obx_schema_id, obx_uid])
 
 # obx_err (OBX_model* model, obx_schema_id property_id, obx_uid property_uid);
 obx_model_entity_last_property_id = fn('obx_model_entity_last_property_id', obx_err,

setup.py

@@ -46,6 +46,10 @@
 
     packages=setuptools.find_packages(),
     package_data={
-        'objectbox': ['lib/x86_64/*'],
+        'objectbox': [
+            'lib/x86_64/*',
+            'lib/armv7l/*',
+            'lib/armv6l/*',
+        ],
     }
 )