From ce38b8eb758d6c8b2a618d1753f1689cbd4a7beb Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 9 Sep 2024 16:20:25 -0400 Subject: [PATCH 1/3] change test dir to top level --- {src/diffpy/srmise/tests => tests}/__init__.py | 0 {src/diffpy/srmise/tests => tests}/conftest.py | 0 {src/diffpy/srmise/tests => tests}/debug.py | 0 {src/diffpy/srmise/tests => tests}/run.py | 0 {src/diffpy/srmise/tests => tests}/test_dataclusters.py | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {src/diffpy/srmise/tests => tests}/__init__.py (100%) rename {src/diffpy/srmise/tests => tests}/conftest.py (100%) rename {src/diffpy/srmise/tests => tests}/debug.py (100%) rename {src/diffpy/srmise/tests => tests}/run.py (100%) rename {src/diffpy/srmise/tests => tests}/test_dataclusters.py (100%) diff --git a/src/diffpy/srmise/tests/__init__.py b/tests/__init__.py similarity index 100% rename from src/diffpy/srmise/tests/__init__.py rename to tests/__init__.py diff --git a/src/diffpy/srmise/tests/conftest.py b/tests/conftest.py similarity index 100% rename from src/diffpy/srmise/tests/conftest.py rename to tests/conftest.py diff --git a/src/diffpy/srmise/tests/debug.py b/tests/debug.py similarity index 100% rename from src/diffpy/srmise/tests/debug.py rename to tests/debug.py diff --git a/src/diffpy/srmise/tests/run.py b/tests/run.py similarity index 100% rename from src/diffpy/srmise/tests/run.py rename to tests/run.py diff --git a/src/diffpy/srmise/tests/test_dataclusters.py b/tests/test_dataclusters.py similarity index 100% rename from src/diffpy/srmise/tests/test_dataclusters.py rename to tests/test_dataclusters.py From fd9a4f2d94963e3d7cdb31a6a518f9e38dc03d0a Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 9 Sep 2024 16:26:40 -0400 Subject: [PATCH 2/3] move run.py and debug.py --- tests/debug.py | 35 ----------------------------------- tests/run.py | 34 ---------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 tests/debug.py delete mode 100644 tests/run.py diff --git a/tests/debug.py b/tests/debug.py deleted file mode 100644 index 313b120..0000000 --- a/tests/debug.py +++ /dev/null @@ -1,35 +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.srmise/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## - -""" -Convenience module for debugging the unit tests using - -python -m diffpy.srmise.tests.debug - -Exceptions raised by failed tests or other errors are not caught. -""" - - -if __name__ == "__main__": - import sys - - from diffpy.srmise.tests import testsuite - - pattern = sys.argv[1] if len(sys.argv) > 1 else "" - suite = testsuite(pattern) - suite.debug() - - -# End of file diff --git a/tests/run.py b/tests/run.py deleted file mode 100644 index afe4bbf..0000000 --- a/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.srmise/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## -"""Convenience module for executing all unit tests with -python -m diffpy.srmise.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 From 56e8e2262e3d1f9f55fa49c60242792af04b77fb Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Thu, 12 Sep 2024 22:35:15 -0400 Subject: [PATCH 3/3] remove __init__.py --- tests/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/__init__.py diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000