src

Author: Tieqiong

src/diffpy/__init__.py

@@ -1,26 +1,22 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy            by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2008 The Trustees of Columbia University
-#                   in the City of New York.  All rights reserved.
+# (c) 2025 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.srreal/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
-"""diffpy - tools for structure analysis by diffraction.
-
-Blank namespace package.
-"""
+"""Blank namespace package for module diffpy."""
 
 
 from pkgutil import extend_path
 
 __path__ = extend_path(__path__, __name__)
 
-
 # End of file

src/diffpy/srreal/__init__.py

@@ -1,21 +1,21 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.srreal     by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2008 The Trustees of Columbia University
-#                   in the City of New York.  All rights reserved.
+# (c) 2025 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.srreal/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 """Tools for real space structure analysis."""
 
 # package version
-from diffpy.srreal._version_data import __version__
+from diffpy.srreal.version import __version__
 
 # silence the pyflakes syntax checker
 assert __version__ or True

src/diffpy/srreal/_version_data.py

@@ -1,61 +1,25 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.srreal     by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2008 The Trustees of Columbia University
-#                   in the City of New York.  All rights reserved.
+# (c) 2025 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.srreal/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
-"""Definitions of version-related constants and of libdiffpy_version_info.
-
-Notes
------
-Variable `__gitsha__` is deprecated as of version 1.3.
-Use `__git_commit__` instead.
-
-Variable `libdiffpy_version_info.git_sha` is deprecated as of version 1.4.0.
-Use `libdiffpy_version_info.git_commit` instead.
-"""
-
-__all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__", "libdiffpy_version_info"]
-
-
-from diffpy.srreal._version_data import __date__, __git_commit__, __timestamp__, __version__
-
-# TODO remove deprecated __gitsha__ in version 1.4.
-__gitsha__ = __git_commit__
-
-# version information on the active libdiffpy shared library -----------------
+"""Definition of __version__."""
 
-from collections import namedtuple
+#  We do not use the other three variables, but can be added back if needed.
+#  __all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"]
 
-from diffpy.srreal.srreal_ext import _get_libdiffpy_version_info_dict
+# obtain version information
+from importlib.metadata import version
 
-libdiffpy_version_info = namedtuple(
-    "libdiffpy_version_info",
-    "major minor micro patch version_number version date git_commit " +
-    # TODO remove git_sha in version 1.4.
-    "git_sha",
-)
-vd = _get_libdiffpy_version_info_dict()
-libdiffpy_version_info = libdiffpy_version_info(
-    version=vd["version_str"],
-    version_number=vd["version"],
-    major=vd["major"],
-    minor=vd["minor"],
-    micro=vd["micro"],
-    patch=vd["patch"],
-    date=vd["date"],
-    git_commit=vd["git_commit"],
-    # TODO remove git_sha in version 1.4.
-    git_sha=vd["git_commit"],
-)
-del vd
+__version__ = version("diffpy.srreal")
 
 # End of file