Skip to content

Commit 7c48a59

Browse files
committed
Rewrite version.py
1 parent 0ba9382 commit 7c48a59

File tree

1 file changed

+6
-39
lines changed

1 file changed

+6
-39
lines changed

src/diffpy/utils/version.py

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,13 @@
1313
#
1414
##############################################################################
1515

16-
"""
17-
Definition of __version__, __date__, __timestamp__, __git_commit__.
16+
"""Definition of __version__."""
1817

19-
Notes
20-
-----
21-
Variable `__gitsha__` is deprecated as of version 3.0.
22-
Use `__git_commit__` instead.
23-
"""
18+
# We do not use the other three variables, but can be added back if needed.
19+
# __all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"]
2420

25-
__all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"]
26-
27-
import os.path
28-
from importlib.resources import as_file, files
29-
30-
# obtain version information from the version.cfg file
31-
cp = dict(version="", date="", commit="", timestamp="0")
32-
if __package__ is not None:
33-
ref = files(__package__) / "version.cfg"
34-
with as_file(ref) as fcfg:
35-
if not os.path.isfile(fcfg): # pragma: no cover
36-
from warnings import warn
37-
38-
warn("Package metadata not found.")
39-
fcfg = os.devnull
40-
with open(fcfg) as fp:
41-
kwords = [
42-
[w.strip() for w in line.split(" = ", 1)] for line in fp if line[:1].isalpha() and " = " in line
43-
]
44-
assert all(w[0] in cp for w in kwords), "received unrecognized keyword"
45-
cp.update(kwords)
46-
del kwords
47-
48-
__version__ = cp["version"]
49-
__date__ = cp["date"]
50-
__git_commit__ = cp["commit"]
51-
__timestamp__ = int(cp["timestamp"])
52-
53-
# TODO remove deprecated __gitsha__ in version 3.1.
54-
__gitsha__ = __git_commit__
55-
56-
del cp
21+
# obtain version information
22+
from importlib.metadata import version
23+
__version__ = version("diffpy.utils")
5724

5825
# End of file

0 commit comments

Comments
 (0)