Move tests dir and use testutils

sbillinge · Sep 26, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024
commit 5369f6ae66b3c2f37b964cb3ec0cf37a1423e5e9
diff --git a/requirements/run.txt b/requirements/run.txt
@@ -1,4 +1,4 @@
-numpy < 2.0.0  # Need to fix deprecations before 2.0.0 compat
+numpy
 wxpython
 diffpy.pdffit2
 diffpy.structure

diff --git a/src/diffpy/pdfgui/tests/__init__.py b/src/diffpy/pdfgui/tests/__init__.py
diff --git a/src/diffpy/pdfgui/tests/conftest.py b/src/diffpy/pdfgui/tests/conftest.py
diff --git a/src/diffpy/pdfgui/tests/debug.py b/src/diffpy/pdfgui/tests/debug.py
diff --git a/src/diffpy/pdfgui/tests/run.py b/src/diffpy/pdfgui/tests/run.py
diff --git a/...py/pdfgui/tests/showphasenotebookpanel.py → tests/showphasenotebookpanel.py b/...py/pdfgui/tests/showphasenotebookpanel.py → tests/showphasenotebookpanel.py
diff --git a/src/diffpy/pdfgui/tests/test_aboutdialog.py → tests/test_aboutdialog.py b/src/diffpy/pdfgui/tests/test_aboutdialog.py → tests/test_aboutdialog.py
@@ -20,12 +20,12 @@
 import unittest
 
 import wx
-
+import pytest
 from diffpy.pdfgui.gui import aboutdialog
-from diffpy.pdfgui.tests.testutils import GUITestCase, overridewebbrowser
+from testutils import GUITestCase, overridewebbrowser
 
-# ----------------------------------------------------------------------------
 
+# ----------------------------------------------------------------------------
 
 class TestDialogAbout(GUITestCase):
     def setUp(self):

diff --git a/src/diffpy/pdfgui/tests/test_calculation.py → tests/test_calculation.py b/src/diffpy/pdfgui/tests/test_calculation.py → tests/test_calculation.py
diff --git a/src/diffpy/pdfgui/tests/test_constraint.py → tests/test_constraint.py b/src/diffpy/pdfgui/tests/test_constraint.py → tests/test_constraint.py
diff --git a/...diffpy/pdfgui/tests/test_datasetpanels.py → tests/test_datasetpanels.py b/...diffpy/pdfgui/tests/test_datasetpanels.py → tests/test_datasetpanels.py
@@ -22,7 +22,7 @@
 import wx
 
 from diffpy.pdfgui.gui.mainframe import MainFrame
-from diffpy.pdfgui.tests.testutils import GUITestCase, datafile, tooltiptext
+from testutils import GUITestCase, datafile, tooltiptext
 
 # ----------------------------------------------------------------------------
 

diff --git a/...py/pdfgui/tests/test_dopingseriespanel.py → tests/test_dopingseriespanel.py b/...py/pdfgui/tests/test_dopingseriespanel.py → tests/test_dopingseriespanel.py
@@ -22,7 +22,7 @@
 import wx
 
 from diffpy.pdfgui.gui.dopingseriespanel import DopingSeriesPanel
-from diffpy.pdfgui.tests.testutils import GUITestCase, datafile, overridefiledialog
+from testutils import GUITestCase, datafile, overridefiledialog
 
 # ----------------------------------------------------------------------------
 

diff --git a/...py/pdfgui/tests/test_extendedplotframe.py → tests/test_extendedplotframe.py b/...py/pdfgui/tests/test_extendedplotframe.py → tests/test_extendedplotframe.py
@@ -25,7 +25,7 @@
 from diffpy.pdfgui.control.plotter import Plotter
 from diffpy.pdfgui.gui import extendedplotframe as epf
 from diffpy.pdfgui.gui.extendedplotframe import ExtendedPlotFrame
-from diffpy.pdfgui.tests.testutils import GUITestCase, overridefiledialog
+from testutils import GUITestCase, overridefiledialog
 
 # ----------------------------------------------------------------------------
 

diff --git a/src/diffpy/pdfgui/tests/test_fitdataset.py → tests/test_fitdataset.py b/src/diffpy/pdfgui/tests/test_fitdataset.py → tests/test_fitdataset.py
@@ -23,7 +23,7 @@
 
 import diffpy.pdfgui.control.fitdataset as fds
 from diffpy.pdfgui.control.fitdataset import FitDataSet
-from diffpy.pdfgui.tests.testutils import datafile
+from testutils import datafile
 
 # ----------------------------------------------------------------------------
 

diff --git a/src/diffpy/pdfgui/tests/test_fitstructure.py → tests/test_fitstructure.py b/src/diffpy/pdfgui/tests/test_fitstructure.py → tests/test_fitstructure.py
@@ -10,7 +10,7 @@
 from diffpy.pdfgui.control.controlerrors import ControlTypeError
 from diffpy.pdfgui.control.fitstructure import FitStructure
 from diffpy.pdfgui.control.pdfstructure import PDFStructure
-from diffpy.pdfgui.tests.testutils import datafile
+from testutils import datafile
 from diffpy.structure import Structure
 
 # ----------------------------------------------------------------------------

diff --git a/...fpy/pdfgui/tests/test_insertrowsdialog.py → tests/test_insertrowsdialog.py b/...fpy/pdfgui/tests/test_insertrowsdialog.py → tests/test_insertrowsdialog.py
@@ -22,7 +22,7 @@
 import wx
 
 from diffpy.pdfgui.gui.insertrowsdialog import InsertRowsDialog
-from diffpy.pdfgui.tests.testutils import GUITestCase
+from testutils import GUITestCase
 
 # ----------------------------------------------------------------------------
 

diff --git a/src/diffpy/pdfgui/tests/test_loadproject.py → tests/test_loadproject.py b/src/diffpy/pdfgui/tests/test_loadproject.py → tests/test_loadproject.py
@@ -20,7 +20,7 @@
 import unittest
 
 from diffpy.pdfgui.control.controlerrors import ControlFileError
-from diffpy.pdfgui.tests.testutils import GUITestCase, datafile
+from testutils import GUITestCase, datafile
 from diffpy.pdfgui.tui import LoadProject
 
 # ----------------------------------------------------------------------------

diff --git a/src/diffpy/pdfgui/tests/test_mainframe.py → tests/test_mainframe.py b/src/diffpy/pdfgui/tests/test_mainframe.py → tests/test_mainframe.py
@@ -22,7 +22,7 @@
 import wx
 
 from diffpy.pdfgui.gui.mainframe import MainFrame
-from diffpy.pdfgui.tests.testutils import GUITestCase
+from testutils import GUITestCase
 
 # ----------------------------------------------------------------------------
 

diff --git a/src/diffpy/pdfgui/tests/test_parameter.py → tests/test_parameter.py b/src/diffpy/pdfgui/tests/test_parameter.py → tests/test_parameter.py
@@ -24,7 +24,7 @@
 from diffpy.pdfgui.control.controlerrors import ControlKeyError, ControlTypeError
 from diffpy.pdfgui.control.parameter import Parameter
 from diffpy.pdfgui.gui.mainframe import MainFrame
-from diffpy.pdfgui.tests.testutils import GUITestCase, datafile
+from testutils import GUITestCase, datafile
 
 # ----------------------------------------------------------------------------
 

diff --git a/...ffpy/pdfgui/tests/test_parameterspanel.py → tests/test_parameterspanel.py b/...ffpy/pdfgui/tests/test_parameterspanel.py → tests/test_parameterspanel.py
@@ -23,7 +23,7 @@
 
 from diffpy.pdfgui.control.parameter import Parameter
 from diffpy.pdfgui.gui.parameterspanel import ParametersPanel
-from diffpy.pdfgui.tests.testutils import GUITestCase, clickcell
+from testutils import GUITestCase, clickcell
 
 # ----------------------------------------------------------------------------
 

diff --git a/src/diffpy/pdfgui/tests/test_pdfdataset.py → tests/test_pdfdataset.py b/src/diffpy/pdfgui/tests/test_pdfdataset.py → tests/test_pdfdataset.py
@@ -20,7 +20,7 @@
 import unittest
 
 from diffpy.pdfgui.control.pdfdataset import PDFDataSet
-from diffpy.pdfgui.tests.testutils import datafile
+from testutils import datafile
 
 
 ##############################################################################

diff --git a/...diffpy/pdfgui/tests/test_pdfguicontrol.py → tests/test_pdfguicontrol.py b/...diffpy/pdfgui/tests/test_pdfguicontrol.py → tests/test_pdfguicontrol.py
diff --git a/src/diffpy/pdfgui/tests/test_pdfstructure.py → tests/test_pdfstructure.py b/src/diffpy/pdfgui/tests/test_pdfstructure.py → tests/test_pdfstructure.py
@@ -8,7 +8,7 @@
 
 from diffpy.pdfgui.control.controlerrors import ControlFileError, ControlKeyError
 from diffpy.pdfgui.control.pdfstructure import PDFStructure
-from diffpy.pdfgui.tests.testutils import datafile
+from testutils import datafile
 
 # ----------------------------------------------------------------------------
 

diff --git a/.../pdfgui/tests/test_phaseconfigurepanel.py → tests/test_phaseconfigurepanel.py b/.../pdfgui/tests/test_phaseconfigurepanel.py → tests/test_phaseconfigurepanel.py
@@ -23,7 +23,7 @@
 
 from diffpy.pdfgui.gui.mainframe import MainFrame
 from diffpy.pdfgui.gui.phaseconfigurepanel import PhaseConfigurePanel
-from diffpy.pdfgui.tests.testutils import GUITestCase, clickcell, datafile, overrideclipboard, tooltiptext
+from testutils import GUITestCase, clickcell, datafile, overrideclipboard, tooltiptext
 
 # ----------------------------------------------------------------------------
 

diff --git a/...ffpy/pdfgui/tests/test_structureviewer.py → tests/test_structureviewer.py b/...ffpy/pdfgui/tests/test_structureviewer.py → tests/test_structureviewer.py
@@ -9,7 +9,7 @@
 
 from diffpy.pdfgui.control.controlerrors import ControlConfigError
 from diffpy.pdfgui.control.structureviewer import StructureViewer, getStructureViewer
-from diffpy.pdfgui.tests.testutils import datafile
+from testutils import datafile
 
 
 ##############################################################################

diff --git a/...fgui/tests/test_temperatureseriespanel.py → tests/test_temperatureseriespanel.py b/...fgui/tests/test_temperatureseriespanel.py → tests/test_temperatureseriespanel.py
@@ -22,7 +22,7 @@
 import wx
 
 from diffpy.pdfgui.gui.temperatureseriespanel import TemperatureSeriesPanel
-from diffpy.pdfgui.tests.testutils import GUITestCase, datafile, overridefiledialog
+from testutils import GUITestCase, datafile, overridefiledialog
 
 # ----------------------------------------------------------------------------
 

diff --git a/src/diffpy/pdfgui/tests/testdata/300K.gr → tests/testdata/300K.gr b/src/diffpy/pdfgui/tests/testdata/300K.gr → tests/testdata/300K.gr
diff --git a/src/diffpy/pdfgui/tests/testdata/550K.gr → tests/testdata/550K.gr b/src/diffpy/pdfgui/tests/testdata/550K.gr → tests/testdata/550K.gr
diff --git a/.../pdfgui/tests/testdata/CdSe_bulk_wur.stru → tests/testdata/CdSe_bulk_wur.stru b/.../pdfgui/tests/testdata/CdSe_bulk_wur.stru → tests/testdata/CdSe_bulk_wur.stru
diff --git a/src/diffpy/pdfgui/tests/testdata/LaMnO3.stru → tests/testdata/LaMnO3.stru b/src/diffpy/pdfgui/tests/testdata/LaMnO3.stru → tests/testdata/LaMnO3.stru
diff --git a/src/diffpy/pdfgui/tests/testdata/Ni.dat → tests/testdata/Ni.dat b/src/diffpy/pdfgui/tests/testdata/Ni.dat → tests/testdata/Ni.dat
diff --git a/src/diffpy/pdfgui/tests/testdata/Ni.stru → tests/testdata/Ni.stru b/src/diffpy/pdfgui/tests/testdata/Ni.stru → tests/testdata/Ni.stru
diff --git a/...iffpy/pdfgui/tests/testdata/Ni_2-8.chi.gr → tests/testdata/Ni_2-8.chi.gr b/...iffpy/pdfgui/tests/testdata/Ni_2-8.chi.gr → tests/testdata/Ni_2-8.chi.gr
diff --git a/src/diffpy/pdfgui/tests/testdata/lcmo.ddp → tests/testdata/lcmo.ddp b/src/diffpy/pdfgui/tests/testdata/lcmo.ddp → tests/testdata/lcmo.ddp
diff --git a/src/diffpy/pdfgui/tests/testdata/lcmo_00.gr → tests/testdata/lcmo_00.gr b/src/diffpy/pdfgui/tests/testdata/lcmo_00.gr → tests/testdata/lcmo_00.gr
diff --git a/src/diffpy/pdfgui/tests/testdata/lcmo_20.gr → tests/testdata/lcmo_20.gr b/src/diffpy/pdfgui/tests/testdata/lcmo_20.gr → tests/testdata/lcmo_20.gr
diff --git a/...iffpy/pdfgui/tests/testdata/lcmo_full.ddp → tests/testdata/lcmo_full.ddp b/...iffpy/pdfgui/tests/testdata/lcmo_full.ddp → tests/testdata/lcmo_full.ddp
diff --git a/src/diffpy/pdfgui/tests/testdata/ni.ddp → tests/testdata/ni.ddp b/src/diffpy/pdfgui/tests/testdata/ni.ddp → tests/testdata/ni.ddp
diff --git a/src/diffpy/pdfgui/tests/testutils.py → tests/testutils.py b/src/diffpy/pdfgui/tests/testutils.py → tests/testutils.py
@@ -19,7 +19,6 @@
 import os
 from contextlib import contextmanager
 from unittest import TestCase
-
 import wx
 
 from diffpy.pdfgui.control import pdfguicontrol
@@ -34,7 +33,6 @@ def datafile(filename):
     rv = str(files(__name__).joinpath("testdata", filename))
     return rv
 
-
 @contextmanager
 def overridewebbrowser(fnc_open):
     "Temporarily replace `webbrowser.open` with given function."