__init__.py, version.py

Author: cadenmyers13

src/diffpy/labpdfproc/__init__.py

@@ -1,27 +1,24 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy            by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2010 The Trustees of Columbia University
-#                   in the City of New York.  All rights reserved.
+# (c) 2024 The Trustees of Columbia University in the City of New York.
+# All rights reserved.
 #
-# File coded by:    Pavol Juhas
+# File coded by: Billinge Group members and community contributors.
 #
-# See AUTHORS.txt for a list of people who contributed.
-# See LICENSE_DANSE.txt for license information.
+# See GitHub contributions for a more detailed list of contributors.
+# https://github.com/diffpy/diffpy.labpdfproc/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 
-"""diffpy - tools for structure analysis by diffraction.
-
-Blank namespace package.
-"""
-
-
-from pkgutil import extend_path
+"""Tools for processing x-ray powder diffraction data from laboratory sources"""
 
-__path__ = extend_path(__path__, __name__)
+# package version
+from diffpy.labpdfproc.version import __version__
 
+# silence the pyflakes syntax checker
+assert __version__ or True
 
 # End of file

src/diffpy/labpdfproc/version.py

@@ -1,58 +1,26 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.utils      by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2011 The Trustees of Columbia University
-#                   in the City of New York.  All rights reserved.
+# (c) 2024 The Trustees of Columbia University in the City of New York.
+# All rights reserved.
 #
-# File coded by:    Pavol Juhas
+# File coded by: Billinge Group members and community contributors.
 #
-# See AUTHORS.txt for a list of people who contributed.
-# See LICENSE_DANSE.txt for license information.
+# See GitHub contributions for a more detailed list of contributors.
+# https://github.com/diffpy/diffpy.labpdfproc/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 
-"""
-Definition of __version__, __date__, __timestamp__, __git_commit__.
-
-Notes
------
-Variable `__gitsha__` is deprecated as of version 3.0.
-Use `__git_commit__` instead.
-"""
-
-__all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"]
-
-import os.path
-from importlib.resources import as_file, files
-
-# obtain version information from the version.cfg file
-cp = dict(version="", date="", commit="", timestamp="0")
-if __package__ is not None:
-    ref = files(__package__) / "version.cfg"
-    with as_file(ref) as fcfg:
-        if not os.path.isfile(fcfg):  # pragma: no cover
-            from warnings import warn
-
-            warn("Package metadata not found.")
-            fcfg = os.devnull
-        with open(fcfg) as fp:
-            kwords = [
-                [w.strip() for w in line.split(" = ", 1)] for line in fp if line[:1].isalpha() and " = " in line
-            ]
-        assert all(w[0] in cp for w in kwords), "received unrecognized keyword"
-        cp.update(kwords)
-    del kwords
+"""Definition of __version__."""
 
-__version__ = cp["version"]
-__date__ = cp["date"]
-__git_commit__ = cp["commit"]
-__timestamp__ = int(cp["timestamp"])
+#  We do not use the other three variables, but can be added back if needed.
+#  __all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"]
 
-# TODO remove deprecated __gitsha__ in version 3.1.
-__gitsha__ = __git_commit__
+# obtain version information
+from importlib.metadata import version
 
-del cp
+__version__ = version("diffpy.labpdfproc")
 
 # End of file