chore: change dpx to src/diffpy in package structure

pyproject.toml

@@ -33,7 +33,7 @@ classifiers = [
 ]
 
 [project.scripts]
-srxgui = 'dpx.srxplanargui.srxguiapp:main'
+srxgui = 'diffpy.srxplanargui.srxguiapp:main'
 
 [project.urls]
 Homepage = "https://github.com/diffpy/diffpy.srxplanargui/"
@@ -46,7 +46,7 @@ dev_template = "{tag}"
 dirty_template = "{tag}"
 
 [tool.setuptools.packages.find]
-where = ["dpx"]  # list of folders that contain the packages (["."] by default)
+where = ["src"]  # list of folders that contain the packages (["."] by default)
 include = ["*"]  # package names should match these glob patterns (["*"] by default)
 exclude = []  # exclude packages matching these glob patterns (empty by default)
 namespaces = false  # to disable scanning PEP 420 namespaces (true by default)

dpx/srxplanargui/__init__.py → src/diffpy/srxplanargui/__init__.py

@@ -14,6 +14,6 @@
 
 
 # obtain version information
-from dpx.srxplanargui.version import __version__
+from diffpy.srxplanargui.version import __version__
 
 # End of file

dpx/srxplanargui/calibration.py → src/diffpy/srxplanargui/calibration.py

@@ -33,7 +33,7 @@
 from traitsui.menu import ToolBar, OKButton, CancelButton, Menu, MenuBar, OKCancelButtons
 from pyface.api import ImageResource, SplashScreen
 
-from dpx.srxplanargui.srxconfig import SrXconfig
+from diffpy.srxplanargui.srxconfig import SrXconfig
 from diffpy.srxplanar.srxplanar import SrXplanar
 from diffpy.srxplanar.selfcalibrate import selfCalibrate
 from diffpy.srxplanar.srxplanarconfig import checkMax

dpx/srxplanargui/live.py → src/diffpy/srxplanargui/live.py

@@ -39,12 +39,12 @@
 from traitsui.menu import ToolBar, OKButton, CancelButton, Menu, MenuBar, OKCancelButtons
 from pyface.api import ImageResource, GUI, SplashScreen
 
-from dpx.srxplanargui.selectfiles import AddFiles
-from dpx.srxplanargui.srxconfig import SrXconfig
-from dpx.srxplanargui.srxgui import SrXgui, SrXguiHandler, SaveHandler, LoadHandler
+from diffpy.srxplanargui.selectfiles import AddFiles
+from diffpy.srxplanargui.srxconfig import SrXconfig
+from diffpy.srxplanargui.srxgui import SrXgui, SrXguiHandler, SaveHandler, LoadHandler
 from diffpy.srxplanar.srxplanar import SrXplanar
-from dpx.srxplanargui.help import SrXguiHelp
-from dpx.srxplanargui.calibration import Calibration
+from diffpy.srxplanargui.help import SrXguiHelp
+from diffpy.srxplanargui.calibration import Calibration
 
 from diffpy.srxconfutils.tools import checkFileVal
 

dpx/srxplanargui/selectfiles.py → src/diffpy/srxplanargui/selectfiles.py

@@ -39,9 +39,9 @@
     from diffpy.pdfgetx.functs import sortKeyNumericString
 except:
     from diffpy.pdfgete.functs import sortKeyNumericString
-from dpx.srxplanargui.datacontainer import DataContainer
-from dpx.srxplanargui.srxconfig import SrXconfig
-from dpx.srxplanargui.imageplot import ImagePlot
+from diffpy.srxplanargui.datacontainer import DataContainer
+from diffpy.srxplanargui.srxconfig import SrXconfig
+from diffpy.srxplanargui.imageplot import ImagePlot
 from diffpy.srxplanar.loadimage import openImage, saveImage
 
 #-- The Live Search table editor definition ------------------------------

dpx/srxplanargui/srxgui.py → src/diffpy/srxplanargui/srxgui.py

@@ -35,11 +35,11 @@
 from traitsui.menu import ToolBar, OKButton, CancelButton, Menu, MenuBar, OKCancelButtons
 from pyface.api import ImageResource, SplashScreen
 
-from dpx.srxplanargui.selectfiles import AddFiles
-from dpx.srxplanargui.srxconfig import SrXconfig
+from diffpy.srxplanargui.selectfiles import AddFiles
+from diffpy.srxplanargui.srxconfig import SrXconfig
 from diffpy.srxplanar.srxplanar import SrXplanar
-from dpx.srxplanargui.help import SrXguiHelp
-from dpx.srxplanargui.calibration import Calibration
+from diffpy.srxplanargui.help import SrXguiHelp
+from diffpy.srxplanargui.calibration import Calibration
 
 class SrXguiHandler(Handler):
 

dpx/srxplanargui/srxguiapp.py → src/diffpy/srxplanargui/srxguiapp.py

@@ -27,7 +27,7 @@
 # break if help passed to the args
 sysargv = sys.argv[1:]
 if ('--help' in sysargv) or('-h' in sysargv):
-    from dpx.srxplanargui.srxconfig import SrXconfig
+    from diffpy.srxplanargui.srxconfig import SrXconfig
     SrXconfig(args=sysargv)
 
 from traits.etsconfig.api import ETSConfig
@@ -41,7 +41,7 @@
 if not any([aa == '-h' or aa == '--help' for aa in sysargv]):
     splash.open()
 
-from dpx.srxplanargui.srxgui import SrXgui
+from diffpy.srxplanargui.srxgui import SrXgui
 
 def main():
     gui = SrXgui(splash=splash)