Skip to content

Commit eb7160a

Browse files
Merge pull request #60 from rpanderson/self-contained-version
Obtain own version without external functions
2 parents efe2af9 + b8e7a6f commit eb7160a

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

labscript/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,4 @@
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 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
42+
from .__version__ import __version__

labscript/__version__.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import os
2+
from pathlib import Path
3+
try:
4+
import importlib.metadata as importlib_metadata
5+
except ImportError:
6+
import importlib_metadata
7+
8+
VERSION_SCHEME = {
9+
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
10+
"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
11+
}
12+
13+
root = Path(__file__).parent.parent
14+
if (root / '.git').is_dir():
15+
from setuptools_scm import get_version
16+
__version__ = get_version(root, **VERSION_SCHEME)
17+
else:
18+
try:
19+
__version__ = importlib_metadata.version(__package__)
20+
except importlib_metadata.PackageNotFoundError:
21+
__version__ = None

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ include_package_data = True
2525
packages = find:
2626
python_requires = >=3.6
2727
install_requires =
28+
importlib_metadata
2829
labscript_utils>=2.14.0
2930
numpy>=1.15
3031
scipy

0 commit comments

Comments
 (0)