From 6b65fa3723a1ac41e068455be6589d032a193400 Mon Sep 17 00:00:00 2001 From: Kentaro Wada Date: Thu, 26 Apr 2018 23:44:52 +0900 Subject: [PATCH] Stop using pkg_resources.get_distribution for version --- labelme.spec | 2 +- labelme/__init__.py | 4 ++-- labelme/_version.py | 1 + setup.py | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 labelme/_version.py diff --git a/labelme.spec b/labelme.spec index 3b61345..61ad892 100644 --- a/labelme.spec +++ b/labelme.spec @@ -7,7 +7,7 @@ block_cipher = None a = Analysis( ['labelme/app.py'], - pathex=['.'], + pathex=['labelme'], binaries=[], datas=[ ('labelme/config/default_config.yaml', 'labelme/config'), diff --git a/labelme/__init__.py b/labelme/__init__.py index 40cf009..4e7ad74 100644 --- a/labelme/__init__.py +++ b/labelme/__init__.py @@ -1,15 +1,15 @@ # flake8: noqa import logging -import pkg_resources __appname__ = 'labelme' -__version__ = pkg_resources.get_distribution(__appname__).version logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__appname__) +from labelme._version import __version__ + from labelme import testing from labelme import utils diff --git a/labelme/_version.py b/labelme/_version.py new file mode 100644 index 0000000..0b288f8 --- /dev/null +++ b/labelme/_version.py @@ -0,0 +1 @@ +__version__ = '2.12.0' diff --git a/setup.py b/setup.py index 983694a..9cce194 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +import imp +import os.path from setuptools import find_packages from setuptools import setup import shlex @@ -10,7 +12,10 @@ PY2 = sys.version_info[0] == 2 assert PY3 or PY2 -version = '2.12.0' +here = os.path.abspath(os.path.dirname(__file__)) +version = imp.load_source( + '_version', os.path.join(here, 'labelme', '_version.py')).__version__ +del here install_requires = [ -- GitLab