diff --git a/src/diffpy/pdfgui/tests/__init__.py b/src/diffpy/pdfgui/tests/__init__.py index 863e9949..40209476 100644 --- a/src/diffpy/pdfgui/tests/__init__.py +++ b/src/diffpy/pdfgui/tests/__init__.py @@ -78,28 +78,4 @@ def test(): return result -def testdeps(): - """Execute all unit tests for diffpy.pdfgui and its dependencies. - - Returns - ------- - result : `unittest.TestResult` - """ - from importlib import import_module - - modulenames = """ - diffpy.pdfgui.tests - diffpy.structure.tests - diffpy.pdffit2.tests - diffpy.utils.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/pdfgui/tests/conftest.py b/src/diffpy/pdfgui/tests/conftest.py index fefe798b..e3b63139 100644 --- a/src/diffpy/pdfgui/tests/conftest.py +++ b/src/diffpy/pdfgui/tests/conftest.py @@ -1,14 +1,9 @@ import json -import subprocess from pathlib import Path import pytest -def pytest_collection_modifyitems(session, config, items): - subprocess.run(["python", "-m", "diffpy.pdfgui.tests.rundeps"], check=True) - - @pytest.fixture def user_filesystem(tmp_path): base_dir = Path(tmp_path) diff --git a/src/diffpy/pdfgui/tests/rundeps.py b/src/diffpy/pdfgui/tests/rundeps.py deleted file mode 100644 index 9818fc86..00000000 --- a/src/diffpy/pdfgui/tests/rundeps.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -############################################################################## -# -# diffpy.pdfgui by DANSE Diffraction group -# Simon J. L. Billinge -# (c) 2012-2024 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 pdfgui dependencies - -python -m diffpy.pdfgui.tests.rundeps -""" - - -if __name__ == "__main__": - import sys - - from diffpy.pdfgui.tests import testdeps - - # produce zero exit code for a successful test - sys.exit(not testdeps().wasSuccessful()) - -# End of file