Skip to content

Commit 26f6892

Browse files
Merge pull request #57 from chrisjbillington/single-truth-version
Use setuptools_scm for setup.py version
2 parents 936d6a1 + 44ab312 commit 26f6892

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

labscript/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,8 @@
3939
# elif sys.argv[0]:
4040
# labscript_init(sys.argv[0].replace('.py','.h5'), labscript_file=sys.argv[0], new=True, overwrite=overwrite)
4141

42-
from .__version__ import __version__
42+
from labscript_utils.versions import get_version, NoVersionInfo
43+
from pathlib import Path
44+
__version__ = get_version(__name__, import_path=Path(__file__).parent.parent)
45+
if __version__ is NoVersionInfo:
46+
__version__ = None

labscript/__version__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
import os
4242
from setuptools import setup
43-
from runpy import run_path
4443

4544
try:
4645
from setuptools_conda import dist_conda
@@ -58,7 +57,7 @@
5857

5958
setup(
6059
name='labscript',
61-
version=run_path(os.path.join('labscript', '__version__.py'))['__version__'],
60+
use_scm_version=True,
6261
description="The labscript compiler",
6362
long_description=open('README.md').read(),
6463
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)