Update rfi_receiver versioner include and install process. (kotekan#720)

* Use versioneer to get kotekan version. * Call versioneer directly in cmake to get kotekan version. No need for print_kotekan_version.py anymore.
CHIMEFRB · Apr 14, 2020 · d015ad2 · d015ad2
1 parent dbde06f
commit d015ad2
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 26 deletions.
diff --git a/lib/version/make_version.cmake.in b/lib/version/make_version.cmake.in
@@ -45,8 +45,8 @@ execute_process(
 )
 
 execute_process(
-  COMMAND python ${SOURCE_DIR}/python/print_kotekan_version.py
-  WORKING_DIRECTORY ${SOURCE_DIR}
+  COMMAND python -c "import kotekan; print(kotekan.__version__)"
+  WORKING_DIRECTORY ${SOURCE_DIR}/python/
   OUTPUT_VARIABLE KOTEKAN_VERSION
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )

diff --git a/lib/version/version.h b/lib/version/version.h
@@ -16,7 +16,7 @@ extern "C" {
 
 /**
  * @brief Get the kotekan version string
- * The version is generated using versioneer, see python/_version.py
+ * The version is generated using versioneer, see python/kotekan/_version.py
  * This version is updated every time make is called
  *
  * @return The kotekan version string

diff --git a/python/kotekan/__init__.py b/python/kotekan/__init__.py
@@ -4,6 +4,8 @@
 from future.builtins.disabled import *  # noqa  pylint: disable=W0401, W0614
 
 # === End Python 2/3 compatibility
+from ._version import get_versions
 
 # Should probably set this from the overall kotekan version
-__version__ = "2019.10"
+__version__ = get_versions()["version"]
+del get_versions
diff --git a/python/_version.py → python/kotekan/_version.py b/python/_version.py → python/kotekan/_version.py
diff --git a/python/print_kotekan_version.py b/python/print_kotekan_version.py
diff --git a/python/scripts/rfi_receiver/rfi_receiver.py b/python/scripts/rfi_receiver/rfi_receiver.py
@@ -36,15 +36,8 @@
 import json
 import imp
 from ch_util import ephemeris
+from kotekan import __version__
 
-# Get version number
-try:
-    _version = imp.load_source("get_versions", "../../_version.py")
-    __version__ = _version.get_versions()["version"]
-    del _version
-except FileNotFoundError:
-    with open("/usr/local/share/rfi_receiver/version.txt") as f:
-        __version__ = f.readline()
 
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)

diff --git a/python/scripts/rfi_receiver/setup.cfg b/python/scripts/rfi_receiver/setup.cfg
diff --git a/python/setup.cfg b/python/setup.cfg
@@ -3,6 +3,6 @@
 [versioneer]
 VCS = git
 style = pep440
-versionfile_source = _version.py
-versionfile_build = _version.py
+versionfile_source = kotekan/_version.py
+versionfile_build = kotekan/_version.py
 tag_prefix =
diff --git a/python/setup.py b/python/setup.py
@@ -29,11 +29,12 @@
     long_description=long_description,
     url="http://github.com/kotekan/kotekan/",
     packages=find_packages(),
+    py_modules=["_version"],
     install_requires=requirements,
     entry_points="""
         [console_scripts]
         kotekan-ctl=kotekan.scripts.ctl:cli
         polyco-tools=kotekan.scripts.polyco_tools:cli
     """,
-    scripts=["scripts/rfi_receiver.py"],
+    scripts=["scripts/rfi_receiver/rfi_receiver.py"],
 )