summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-12 21:12:52 +0200
committerKali Kaneko <kali@leap.se>2013-08-12 21:12:52 +0200
commit4ec1c1d0994ef9f6f11c7da42ec314d6322bbaa2 (patch)
tree5de3c534b3e85bdadbb7d5155363ba43dd40fab9
parentb37fae117d904cb200aa35ea7155acfee3a02ac9 (diff)
fix versioneer to use new path
-rwxr-xr-xsetup.py2
-rw-r--r--src/leap/bitmask/_version.py2
-rw-r--r--src/leap/bitmask/util/__init__.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 5e8839b0..49bbc061 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ import versioneer
versioneer.versionfile_source = 'src/leap/bitmask/_version.py'
versioneer.versionfile_build = 'leap/bitmask/_version.py'
versioneer.tag_prefix = '' # tags are like 1.2.0
-versioneer.parentdir_prefix = 'bitmask-'
+#versioneer.parentdir_prefix = 'bitmask-'
#from setuptools import Command
diff --git a/src/leap/bitmask/_version.py b/src/leap/bitmask/_version.py
index 05542975..412b0c9e 100644
--- a/src/leap/bitmask/_version.py
+++ b/src/leap/bitmask/_version.py
@@ -185,7 +185,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source,
tag_prefix = ""
parentdir_prefix = "bitmask-"
-versionfile_source = "src/leap/_version.py"
+versionfile_source = "src/leap/bitmask/_version.py"
def get_versions(default={"version": "unknown", "full": ""}, verbose=False):
diff --git a/src/leap/bitmask/util/__init__.py b/src/leap/bitmask/util/__init__.py
index f39b52e9..ce8323cd 100644
--- a/src/leap/bitmask/util/__init__.py
+++ b/src/leap/bitmask/util/__init__.py
@@ -49,7 +49,7 @@ __version__ = "unknown"
IS_RELEASE_VERSION = False
try:
- from leap._version import get_versions
+ from leap.bitmask._version import get_versions
__version__ = get_versions()['version']
IS_RELEASE_VERSION = _is_release_version(__version__)
del get_versions