From a8816a62821366aa22ec2ccda969163b7ed2f00b Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 12 Aug 2024 08:46:51 -0400 Subject: [PATCH 1/4] Fix typo in run.py to run flake8 --- src/diffpy/nmf_mapping/tests/run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffpy/nmf_mapping/tests/run.py b/src/diffpy/nmf_mapping/tests/run.py index 389c772..02b30c9 100644 --- a/src/diffpy/nmf_mapping/tests/run.py +++ b/src/diffpy/nmf_mapping/tests/run.py @@ -7,13 +7,13 @@ # File coded by: Billinge Group members and community contributors. # # See GitHub contributions for a more detailed list of contributors. -# https://github.com/diffpy/diffpy.nmf_mapping/graphs/contributors +# https://github.com/diffpy/diffpy.snmf/graphs/contributors # # See LICENSE.rst for license information. # ############################################################################## """Convenience module for executing all unit tests with -python -m \.tests.run +python -m diffpy.snmf.tests.run """ import sys From 451fd78966b1586753d2247a684fb54e6e262b76 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 12 Aug 2024 08:49:12 -0400 Subject: [PATCH 2/4] Fix from snmf to nmf_mapping --- src/diffpy/nmf_mapping/tests/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/nmf_mapping/tests/run.py b/src/diffpy/nmf_mapping/tests/run.py index 02b30c9..d38677f 100644 --- a/src/diffpy/nmf_mapping/tests/run.py +++ b/src/diffpy/nmf_mapping/tests/run.py @@ -13,7 +13,7 @@ # ############################################################################## """Convenience module for executing all unit tests with -python -m diffpy.snmf.tests.run +python -m diffpy.nmf_mapping.tests.run """ import sys From a9913c8253b499037c2187dd2e33cb58b6479a05 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 12 Aug 2024 08:50:50 -0400 Subject: [PATCH 3/4] Fix snmf to nmf_mapping in comment --- src/diffpy/nmf_mapping/tests/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/nmf_mapping/tests/run.py b/src/diffpy/nmf_mapping/tests/run.py index d38677f..db406fa 100644 --- a/src/diffpy/nmf_mapping/tests/run.py +++ b/src/diffpy/nmf_mapping/tests/run.py @@ -7,7 +7,7 @@ # File coded by: Billinge Group members and community contributors. # # See GitHub contributions for a more detailed list of contributors. -# https://github.com/diffpy/diffpy.snmf/graphs/contributors +# https://github.com/diffpy/diffpy.nmf_mapping/graphs/contributors # # See LICENSE.rst for license information. # From dd2d5c29d502563e6d2cd2947233c3a20f92fa5d Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Mon, 12 Aug 2024 20:01:31 -0400 Subject: [PATCH 4/4] Remove files for testing --- run_tests.py | 16 -------------- src/diffpy/nmf_mapping/tests/run.py | 34 ----------------------------- 2 files changed, 50 deletions(-) delete mode 100644 run_tests.py delete mode 100644 src/diffpy/nmf_mapping/tests/run.py diff --git a/run_tests.py b/run_tests.py deleted file mode 100644 index 3fec742..0000000 --- a/run_tests.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python -import sys - -import pytest - -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 so that - # travis will fail correctly if tests fail - exit_res = pytest.main(args) - sys.exit(exit_res) diff --git a/src/diffpy/nmf_mapping/tests/run.py b/src/diffpy/nmf_mapping/tests/run.py deleted file mode 100644 index db406fa..0000000 --- a/src/diffpy/nmf_mapping/tests/run.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python -############################################################################## -# -# (c) 2024 The Trustees of Columbia University in the City of New York. -# All rights reserved. -# -# File coded by: Billinge Group members and community contributors. -# -# See GitHub contributions for a more detailed list of contributors. -# https://github.com/diffpy/diffpy.nmf_mapping/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## -"""Convenience module for executing all unit tests with -python -m diffpy.nmf_mapping.tests.run -""" - -import sys - -import pytest - -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