Merge pull request #41 from chrisjbillington/single-truth-version

Use setuptools_scm for setup.py version

Author: chrisjbillington

labscript_devices/__init__.py

@@ -21,7 +21,11 @@
 from labscript_utils import labscript_suite_install_dir, dedent
 from labscript_utils.labconfig import LabConfig
 
-from .__version__ import __version__
+from labscript_utils.versions import get_version, NoVersionInfo
+from pathlib import Path
+__version__ = get_version(__name__, import_path=Path(__file__).parent.parent)
+if __version__ is NoVersionInfo:
+    __version__ = None
 
 check_version('qtutils', '2.0.0', '3.0.0')
 check_version('labscript', '2.6', '3')

labscript_devices/__version__.py

@@ -40,7 +40,6 @@
 
 import os
 from setuptools import setup
-from runpy import run_path
 
 try:
     from setuptools_conda import dist_conda
@@ -49,7 +48,6 @@
 
 SETUP_REQUIRES = ['setuptools', 'setuptools_scm']
 
-# TODO: Add commented-out requirements once they are on conda:
 INSTALL_REQUIRES = [
     "labscript_utils >= 2.13.2",
     "blacs >= 2.7.0",
@@ -59,14 +57,14 @@
     "numpy >=1.15.1",
     "pyserial",
     "pillow",
-    # PyDAQmx
-    # PyNIVision
-    # spinapi
+    "PyDAQmx",
+    "PyNIVision",
+    "spinapi",
 ]
 
 setup(
     name='labscript_devices',
-    version=run_path(os.path.join('labscript_devices', '__version__.py'))['__version__'],
+    use_scm_version=True,
     description="Device drivers for the labscript suite",
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',