diff --git a/docs/develop.md b/docs/develop.md index b4c4fdd..a99f7ed 100644 --- a/docs/develop.md +++ b/docs/develop.md @@ -101,7 +101,8 @@ your r329 ## pypi upload -- python3 setup.py sdist build +- python3 setup.py sdist +- python3 setup.py build && pip3 install . - python3.8 setup.py bdist_wheel maix_v83x > pip3 install twine diff --git a/ext_modules/_maix_image/_maix_image.cpp b/ext_modules/_maix_image/_maix_image.cpp index 03601fe..7d73c34 100644 --- a/ext_modules/_maix_image/_maix_image.cpp +++ b/ext_modules/_maix_image/_maix_image.cpp @@ -264,6 +264,7 @@ maix_image &maix_image::_open_file(std::string path) libmaix_image_t *tmp_img = NULL; if (libmaix_cv_image_open_file(&tmp_img, path.c_str()) != 0) { + printf("[image.open] %s file does not exist\r\n", path.c_str()); this->v_close(); return *this; } diff --git a/ext_modules/libmaix b/ext_modules/libmaix index 11a7725..1f3f231 160000 --- a/ext_modules/libmaix +++ b/ext_modules/libmaix @@ -1 +1 @@ -Subproject commit 11a7725696e03e748f9c5fb64b7682d4d53c3fca +Subproject commit 1f3f2313790e06f45e614c1e81a47699db99702f diff --git a/maix/__init__.py b/maix/__init__.py index 4436ff8..29ecaef 100644 --- a/maix/__init__.py +++ b/maix/__init__.py @@ -1,8 +1,13 @@ -__all__ = ['nn', 'display', 'camera'] +version='0.4.8' + +__all__ = ['nn', 'display', 'camera', 'image'] try: from . import nn __all__.extend(['nn']) except ModuleNotFoundError as e: pass + +import signal +signal.signal(signal.SIGINT,lambda signum,frame:exit(0)) diff --git a/setup.py b/setup.py index af7fd71..25088e4 100644 --- a/setup.py +++ b/setup.py @@ -4,13 +4,10 @@ setup.py file for maixpy3 """ -import sys -import platform -from setuptools import setup, Extension, find_packages +import sys, platform +from setuptools import setup, find_packages -ext_modules = [] -data_files = [] -py_modules = [] +ext_modules, data_files, py_modules = [], [], [] sysstr = platform.system() @@ -30,9 +27,11 @@ data_files.extend(_maix_data_files) py_modules.extend(_maix_py_modules) +from maix import version + setup( name='maixpy3', - version='0.4.8', + version=version, license='MIT', author='Sipeed', author_email="support@sipeed.com",