tests run.py and version.py

Author: sbillinge

src/diffpy/__init__.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy            by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2008 Trustees of the 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.txt for license information.
+# See GitHub contributions for a more detailed list of contributors.
+# https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 
@@ -22,5 +22,4 @@
 
 __path__ = extend_path(__path__, __name__)
 
-
 # End of file

src/diffpy/pdfmorph/tests/run.py

@@ -1,35 +1,34 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.structure  by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2010 Trustees of the 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.pdfmorph/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
-
 """Convenience module for executing all unit tests with
-python -m diffpy.morphs.tests.run
+python -m diffpy.pdfmorph.tests.run
 """
 
+import sys
 
-if __name__ == "__main__":
-    import sys
+import pytest
 
-    # show warnings by default
-    if not sys.warnoptions:
-        import os
-        import warnings
-
-        warnings.simplefilter("default")
-        # also affect subprocesses
-        os.environ["PYTHONWARNINGS"] = "default"
-    from diffpy.pdfmorph.tests import test
+if __name__ == "__main__":
+    # show output results from every test function
+    args = ["-v"]
+    # show the message output for skipped and expected failure tests
+    if len(sys.argv) > 1:
+        args.extend(sys.argv[1:])
+    print("pytest arguments: {}".format(args))
+    # call pytest and exit with the return code from pytest
+    exit_res = pytest.main(args)
+    sys.exit(exit_res)
 
-    # produce zero exit code for a successful test
-    sys.exit(not test().wasSuccessful())
+# End of file

src/diffpy/pdfmorph/version.py

@@ -1,21 +1,22 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# Structure         by DANSE Diffraction group
-#                   Simon J. L. Billinge
-#                   (c) 2008 trustees of the Michigan State University.
-#                   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.txt for license information.
+# See GitHub contributions for a more detailed list of contributors.
+# https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 
-"""Definition of __version__ for diffpy.pdfmorph.
-"""
+"""Definition of __version__."""
 
+#  We do not use the other three variables, but can be added back if needed.
+#  __all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"]
 
 # obtain version information
 from importlib.metadata import version