From 33424421196d0c69ba56295da3c840c94eae3ec3 Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Mon, 26 Aug 2024 01:58:48 -0400 Subject: [PATCH 1/2] remove deps tests --- src/diffpy/pdffit2/tests/__init__.py | 23 --------------------- src/diffpy/pdffit2/tests/rundeps.py | 30 ---------------------------- 2 files changed, 53 deletions(-) delete mode 100644 src/diffpy/pdffit2/tests/rundeps.py diff --git a/src/diffpy/pdffit2/tests/__init__.py b/src/diffpy/pdffit2/tests/__init__.py index 4ffdb21c..c75200d9 100644 --- a/src/diffpy/pdffit2/tests/__init__.py +++ b/src/diffpy/pdffit2/tests/__init__.py @@ -79,27 +79,4 @@ def test(): result = runner.run(suite) return result - -def testdeps(): - """Execute all unit tests for diffpy.pdffit2 and its dependencies. - - Returns - ------- - result : `unittest.TestResult` - """ - from importlib import import_module - - modulenames = """ - diffpy.pdffit2.tests - diffpy.structure.tests - """.split() - suite = unittest.TestSuite() - for mname in modulenames: - mod = import_module(mname) - suite.addTests(mod.testsuite()) - runner = unittest.TextTestRunner() - result = runner.run(suite) - return result - - # End of file diff --git a/src/diffpy/pdffit2/tests/rundeps.py b/src/diffpy/pdffit2/tests/rundeps.py deleted file mode 100644 index 038475ae..00000000 --- a/src/diffpy/pdffit2/tests/rundeps.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -############################################################################## -# -# diffpy.pdffit2 by DANSE Diffraction group -# Simon J. L. Billinge -# (c) 2012 Trustees of the Columbia University -# in the City of New York. All rights reserved. -# -# File coded by: Pavol Juhas -# -# See AUTHORS.txt for a list of people who contributed. -# See LICENSE.txt for license information. -# -############################################################################## - -"""Convenience module for executing unit tests for all pdffit2 dependencies - -python -m diffpy.pdffit2.tests.rundeps -""" - - -if __name__ == "__main__": - import sys - - from diffpy.pdffit2.tests import testdeps - - # produce zero exit code for a successful test - sys.exit(not testdeps().wasSuccessful()) - -# End of file From 5360df48ce84926d93f6019b6728ba8db68bb067 Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Mon, 26 Aug 2024 01:59:40 -0400 Subject: [PATCH 2/2] fix pcmt --- src/diffpy/pdffit2/tests/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diffpy/pdffit2/tests/__init__.py b/src/diffpy/pdffit2/tests/__init__.py index c75200d9..a27d592f 100644 --- a/src/diffpy/pdffit2/tests/__init__.py +++ b/src/diffpy/pdffit2/tests/__init__.py @@ -79,4 +79,5 @@ def test(): result = runner.run(suite) return result + # End of file