diffpy/__init__, srfit/__init__, tests/debug, run

Author: Tieqiong

Diff for: src/diffpy/__init__.py

@@ -1,26 +1,24 @@
 #!/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) 2024 The Trustees of Columbia University in the City of New York.
+# All rights reserved.
 #
-# File coded by:    Chris Farrow
+# 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.srfit/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__)
 
+__path__ = extend_path(__path__, __name__)
 
 # End of file
+

Diff for: src/diffpy/srfit/__init__.py

@@ -1,39 +1,24 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.srfit      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) 2024 The Trustees of Columbia University in the City of New York.
+# All rights reserved.
 #
-# File coded by:    Chris Farrow
+# 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.srfit/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 
-"""Complex modeling framework for structure refinement and solution.
-
-SrFit is a tool for coherently combining known information about a material to
-derive other properties, in particular material structure. SrFit allows the
-customization and creation of structure representations, profile calculators,
-constraints, restraints and file input parsers. The customized pieces can be
-glued together within SrFit to optimize a structure, or other physically
-relevant information from one or more experimental profiles. Other known
-information about the system of interest can be included with arbitrarily
-complex constraints and restraints. In this way, the end user creates a
-customized fitting application that suits the problem to the available
-information.
-
-The subpackages herein define various pieces of the SrFit framework. Developers
-are encouraged to work through the examples described in the documentation to
-learn how to use and customize the various parts of SrFit.
-"""
-
-__all__ = ["__version__"]
+"""SrFit - Structure refinement from diffraction data"""
 
 # package version
 from diffpy.srfit.version import __version__
 
+# silence the pyflakes syntax checker
+assert __version__ or True
+
 # End of file

Diff for: src/diffpy/srfit/tests/debug.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.srfit      Complex Modeling Initiative
-#                   (c) 2016 Brookhaven Science Associates,
-#                   Brookhaven National Laboratory.
-#                   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.srfit/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
 
@@ -22,10 +22,12 @@
 """
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     import sys
+
     from diffpy.srfit.tests import testsuite
-    pattern = sys.argv[1] if len(sys.argv) > 1 else ''
+
+    pattern = sys.argv[1] if len(sys.argv) > 1 else ""
     suite = testsuite(pattern)
     suite.debug()
 

Diff for: src/diffpy/srfit/tests/run.py

@@ -1,34 +1,34 @@
 #!/usr/bin/env python
 ##############################################################################
 #
-# diffpy.srfit      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.srfit/graphs/contributors
+#
+# See LICENSE.rst for license information.
 #
 ##############################################################################
-
 """Convenience module for executing all unit tests with
-
 python -m diffpy.srfit.tests.run
 """
 
+import sys
+
+import pytest
 
-if __name__ == '__main__':
-    import sys
-    # show warnings by default
-    if not sys.warnoptions:
-        import os, warnings
-        warnings.simplefilter("default")
-        # also affect subprocesses
-        os.environ["PYTHONWARNINGS"] = "default"
-    from diffpy.srfit.tests import test
-    # produce zero exit code for a successful test
-    sys.exit(not test().wasSuccessful())
+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)
 
 # End of file