From 2057586cd7a98b999cb650142fdca91ef2b7b0f4 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 1 Oct 2024 15:09:07 -0400 Subject: [PATCH 1/4] edits for pytest to pass --- diffpy/__init__.py | 23 -------------------- diffpy/fourigui/__init__.py | 24 --------------------- diffpy/fourigui/tests/__init__.py | 0 diffpy/fourigui/tests/conftest.py | 19 ----------------- diffpy/fourigui/tests/debug.py | 35 ------------------------------- diffpy/fourigui/version.py | 26 ----------------------- src/__init__.py | 0 src/diffpy/fourigui/fourigui.py | 2 +- tests/__init__.py | 0 tests/integration_test.py | 2 +- tests/unit_test.py | 2 +- 11 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 diffpy/__init__.py delete mode 100644 diffpy/fourigui/__init__.py delete mode 100644 diffpy/fourigui/tests/__init__.py delete mode 100644 diffpy/fourigui/tests/conftest.py delete mode 100644 diffpy/fourigui/tests/debug.py delete mode 100644 diffpy/fourigui/version.py delete mode 100644 src/__init__.py delete mode 100644 tests/__init__.py diff --git a/diffpy/__init__.py b/diffpy/__init__.py deleted file mode 100644 index 4d4bf70..0000000 --- a/diffpy/__init__.py +++ /dev/null @@ -1,23 +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.fourigui/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## - -"""Blank namespace package for module diffpy.""" - - -from pkgutil import extend_path - -__path__ = extend_path(__path__, __name__) - -# End of file diff --git a/diffpy/fourigui/__init__.py b/diffpy/fourigui/__init__.py deleted file mode 100644 index 3ccc189..0000000 --- a/diffpy/fourigui/__init__.py +++ /dev/null @@ -1,24 +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.fourigui/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## - -"""Tool for visualizing 3D diffraction and PDF Images.""" - -# package version -from diffpy.fourigui.version import __version__ - -# silence the pyflakes syntax checker -assert __version__ or True - -# End of file diff --git a/diffpy/fourigui/tests/__init__.py b/diffpy/fourigui/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/diffpy/fourigui/tests/conftest.py b/diffpy/fourigui/tests/conftest.py deleted file mode 100644 index e3b6313..0000000 --- a/diffpy/fourigui/tests/conftest.py +++ /dev/null @@ -1,19 +0,0 @@ -import json -from pathlib import Path - -import pytest - - -@pytest.fixture -def user_filesystem(tmp_path): - base_dir = Path(tmp_path) - home_dir = base_dir / "home_dir" - home_dir.mkdir(parents=True, exist_ok=True) - cwd_dir = base_dir / "cwd_dir" - cwd_dir.mkdir(parents=True, exist_ok=True) - - home_config_data = {"username": "home_username", "email": "home@email.com"} - with open(home_dir / "diffpyconfig.json", "w") as f: - json.dump(home_config_data, f) - - yield tmp_path diff --git a/diffpy/fourigui/tests/debug.py b/diffpy/fourigui/tests/debug.py deleted file mode 100644 index 60c9014..0000000 --- a/diffpy/fourigui/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.fourigui/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## - -""" -Convenience module for debugging the unit tests using - -python -m diffpy.fourigui.tests.debug - -Exceptions raised by failed tests or other errors are not caught. -""" - - -if __name__ == "__main__": - import sys - - from diffpy.fourigui.tests import testsuite - - pattern = sys.argv[1] if len(sys.argv) > 1 else "" - suite = testsuite(pattern) - suite.debug() - - -# End of file diff --git a/diffpy/fourigui/version.py b/diffpy/fourigui/version.py deleted file mode 100644 index e8b1019..0000000 --- a/diffpy/fourigui/version.py +++ /dev/null @@ -1,26 +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.fourigui/graphs/contributors -# -# See LICENSE.rst for license information. -# -############################################################################## - -"""Definition of __version__.""" - -# We do not use the other three variables, but can be added back if needed. -# __all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"] - -# obtain version information -from importlib.metadata import version - -__version__ = version("diffpy.fourigui") - -# End of file diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 7035231..88dd866 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -8,7 +8,7 @@ from matplotlib import pyplot as plt from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk -matplotlib.use("tk.TkAgg") +matplotlib.use("tkagg") WIDTH = 920 HEIGHT = 630 diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/integration_test.py b/tests/integration_test.py index 043e9ca..44388dd 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -3,7 +3,7 @@ import h5py import numpy as np -from ..fourigui.fourigui import Gui +from diffpy.fourigui.fourigui import Gui class TestGui(unittest.TestCase): diff --git a/tests/unit_test.py b/tests/unit_test.py index 43cc91a..b3b9ce3 100644 --- a/tests/unit_test.py +++ b/tests/unit_test.py @@ -2,7 +2,7 @@ import h5py -from ..fourigui.fourigui import Gui +from diffpy.fourigui.fourigui import Gui class TestGui(unittest.TestCase): From ae7c21e26bbc50a620eab4d464aa83c2ca9f1cf1 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 1 Oct 2024 15:14:05 -0400 Subject: [PATCH 2/4] add imports to run.txt --- requirements/run.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/requirements/run.txt b/requirements/run.txt index e69de29..72627b6 100644 --- a/requirements/run.txt +++ b/requirements/run.txt @@ -0,0 +1,5 @@ +h5py +time +tkinter +matplotlib +numpy From 3256de93943dcdcecb2dabffc939d7fabd3f878d Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 1 Oct 2024 15:16:42 -0400 Subject: [PATCH 3/4] fix tkinter import --- requirements/run.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/run.txt b/requirements/run.txt index 72627b6..f8febd0 100644 --- a/requirements/run.txt +++ b/requirements/run.txt @@ -1,5 +1,5 @@ h5py time -tkinter +tk matplotlib numpy From 9cd0a7bdaa87ffe8609bb3939d80d9eaea6d9fd4 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 1 Oct 2024 15:21:57 -0400 Subject: [PATCH 4/4] change to run headless --- .github/workflows/matrix-and-codecov-on-merge-to-main.yml | 2 +- .github/workflows/tests-on-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index 534196c..e739c34 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -16,6 +16,6 @@ jobs: with: project: diffpy.fourigui c_extension: false - headless: false + headless: true secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index fa361f9..ea8bdb2 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -13,4 +13,4 @@ jobs: with: project: diffpy.fourigui c_extension: false - headless: false + headless: true