Merge pull request #10 from cadenmyers13/pytest

Edits for pytest to pass
diffpy · Oct 1, 2024 · e57883c · e57883c
2 parents 1d5ea71 + 9cd0a7b
commit e57883c
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 132 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
@@ -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
@@ -13,4 +13,4 @@ jobs:
     with:
       project: diffpy.fourigui
       c_extension: false
-      headless: false
+      headless: true
diff --git a/diffpy/__init__.py b/diffpy/__init__.py
diff --git a/diffpy/fourigui/__init__.py b/diffpy/fourigui/__init__.py
diff --git a/diffpy/fourigui/tests/__init__.py b/diffpy/fourigui/tests/__init__.py
diff --git a/diffpy/fourigui/tests/conftest.py b/diffpy/fourigui/tests/conftest.py
diff --git a/diffpy/fourigui/tests/debug.py b/diffpy/fourigui/tests/debug.py
diff --git a/diffpy/fourigui/version.py b/diffpy/fourigui/version.py
diff --git a/requirements/run.txt b/requirements/run.txt
@@ -0,0 +1,5 @@
+h5py
+time
+tk
+matplotlib
+numpy
diff --git a/src/__init__.py b/src/__init__.py
diff --git 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
diff --git 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
@@ -2,7 +2,7 @@
 
 import h5py
 
-from ..fourigui.fourigui import Gui
+from diffpy.fourigui.fourigui import Gui
 
 
 class TestGui(unittest.TestCase):