Skip to content

Commit 4cc1b14

Browse files
authored
Merge pull request #44 from chrisjbillington/self-contained-version
Use standard method of getting own version.
2 parents 176c116 + 1b96552 commit 4cc1b14

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

labscript_utils/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
from pathlib import Path
1818

1919
from .versions import get_version, NoVersionInfo
20-
__version__ = get_version(__name__, import_path=Path(__file__).parent.parent)
21-
if __version__ is NoVersionInfo:
22-
__version__ = None
20+
from .__version__ import __version__
2321

2422
PY2 = sys.version_info[0] == 2
2523

labscript_utils/__version__.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1-
__version__ = '2.16.0.dev3'
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

0 commit comments

Comments
 (0)