summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/__init__.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-03-04 11:27:55 -0400
committerKali Kaneko <kali@leap.se>2016-03-04 11:29:27 -0400
commit9a658c81619af892a4b29e0122cd1c1ba2e428e4 (patch)
tree1636eda1471ee11c464b9bff4ae19368446771db /src/leap/bitmask/__init__.py
parent8e17fb43b4cbda9ee7b386d084e01fc99345f060 (diff)
[pkg] move to versioneer 0.15
Diffstat (limited to 'src/leap/bitmask/__init__.py')
-rw-r--r--src/leap/bitmask/__init__.py50
1 files changed, 8 insertions, 42 deletions
diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py
index 9ec5aae7..966ce91e 100644
--- a/src/leap/bitmask/__init__.py
+++ b/src/leap/bitmask/__init__.py
@@ -19,12 +19,6 @@ Init file for leap.bitmask
Initializes version and app info.
"""
-import re
-
-from pkg_resources import parse_version
-
-from leap.bitmask.util import first
-
# HACK: This is a hack so that py2app copies _scrypt.so to the right
# place, it can't be technically imported, but that doesn't matter
# because the import is never executed
@@ -32,7 +26,7 @@ if False:
import _scrypt # noqa - skip 'not used' warning
-def _is_release_version(version):
+def _is_release_version(version_str):
"""
Helper to determine whether a version is a final release or not.
The release needs to be of the form: w.x.y.z containing only numbers
@@ -43,40 +37,12 @@ def _is_release_version(version):
:returns: if the version is a release version or not.
:rtype: bool
"""
- parsed_version = parse_version(version)
- not_number = 0
- for x in parsed_version:
- try:
- int(x)
- except:
- not_number += 1
-
- return not_number == 1
-
-
-__version__ = "unknown"
-IS_RELEASE_VERSION = False
-
-__short_version__ = "unknown"
-
-try:
- from leap.bitmask._version import get_versions
- __version__ = get_versions()['version']
- __version_hash__ = get_versions()['full']
- IS_RELEASE_VERSION = _is_release_version(__version__)
- del get_versions
-except ImportError:
- # running on a tree that has not run
- # the setup.py setver
- pass
+ parts = __version__.split('.')
+ patch = parts[2]
+ return patch.isdigit()
-__appname__ = "unknown"
-try:
- from leap.bitmask._appname import __appname__
-except ImportError:
- # running on a tree that has not run
- # the setup.py setver
- pass
-__short_version__ = first(re.findall('\d+\.\d+\.\d+', __version__))
-__full_version__ = __appname__ + '/' + str(__version__)
+from ._version import get_versions
+__version__ = get_versions()['version']
+IS_RELEASE_VERSION = _is_release_version(__version__)
+del get_versions