diff --git a/HISTORY.rst b/HISTORY.rst index ccab11fc..56961aef 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,13 @@ History ======= +1.3.0 (2017-04-22) +------------------ + +* Fix issues +* Add difficult tag +* Create new files for pypi + 1.2.3 (2017-04-22) ------------------ diff --git a/labelImg.py b/labelImg.py index b4cc5703..b4c5e80a 100644 --- a/labelImg.py +++ b/labelImg.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- coding: utf8 -*- -import _init_path import codecs import os.path import re @@ -27,7 +26,9 @@ except ImportError: import resources # Add internal libs -sys.path.insert(0, 'libs') +dir_name = os.path.abspath(os.path.dirname(__file__)) +libs_path = os.path.join(dir_name, 'libs') +sys.path.insert(0, libs_path) from lib import struct, newAction, newIcon, addActions, fmtShortcut from shape import Shape, DEFAULT_LINE_COLOR, DEFAULT_FILL_COLOR from canvas import Canvas diff --git a/libs/__init__.py b/libs/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/setup.cfg b/setup.cfg index 31ccd211..7660b0c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.2.4 +current_version = 1.3.0 commit = True tag = True diff --git a/setup.py b/setup.py index 92e61498..e556afc2 100644 --- a/setup.py +++ b/setup.py @@ -21,17 +21,16 @@ test_requirements = [ setup( name='labelImg', - version='1.2.4', + version='1.3.0', description="LabelImg is a graphical image annotation tool and label object bounding boxes in images", long_description=readme + '\n\n' + history, author="TzuTa Lin", author_email='tzu.ta.lin@gmail.com', url='https://github.com/tzutalin/labelImg', packages=[ - 'labelImg', + 'labelImg', 'labelImg.libs' ], - package_dir={'labelImg': - '.'}, + package_dir={'labelImg': '.'}, entry_points={ 'console_scripts': [ 'labelImg=labelImg.labelImg:main' diff --git a/tests/test_io.py b/tests/test_io.py index 84867e8b..d42d7c96 100644 --- a/tests/test_io.py +++ b/tests/test_io.py @@ -1,7 +1,11 @@ -import _init_path from unittest import TestCase +import sys +import os +dir_name = os.path.abspath(os.path.dirname(__file__)) +libs_path = os.path.join(dir_name, '..', 'libs') +sys.path.insert(0, libs_path) from pascal_voc_io import PascalVocWriter from pascal_voc_io import PascalVocReader