diff --git a/HISTORY.rst b/HISTORY.rst index c08cb52d..8e4d9a4d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,12 @@ History ======= +1.8.0 (2018-10-21) +------------------ + +* Support drawing sqaure rect +* Add item single click slot +* Fix issues 1.7.0 (2018-05-18) ------------------ diff --git a/build-tools/build-for-macos.sh b/build-tools/build-for-macos.sh old mode 100644 new mode 100755 diff --git a/libs/version.py b/libs/version.py index cb004605..71e7a2ae 100644 --- a/libs/version.py +++ b/libs/version.py @@ -1,2 +1,2 @@ -__version_info__ = ('1', '7', '0') +__version_info__ = ('1', '8', '0') __version__ = '.'.join(__version_info__) diff --git a/setup.py b/setup.py index 424325a2..f1491279 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ from setuptools import setup, find_packages from libs.version import __version__ +from sys import platform as _platform with open('README.rst') as readme_file: readme = readme_file.read() @@ -14,6 +15,15 @@ requirements = [ # TODO: Different OS have different requirements ] +# OS specific settings +SET_REQUIRES = [] +if _platform == "linux" or _platform == "linux2": + # linux + print('linux') +elif _platform == "darwin": + # MAC OS X + SET_REQUIRES.append('py2app') + required_packages = find_packages() required_packages.append('labelImg') @@ -60,5 +70,5 @@ setup( ], package_data={'data/predefined_classes.txt': ['data/predefined_classes.txt']}, options={'py2app': OPTIONS}, - setup_requires=['py2app'] + setup_requires= SET_REQUIRES )