From ff1469a41066aa575c2f056b21e106ffa07767d2 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Sat, 16 Aug 2025 02:02:37 -0400 Subject: [PATCH 1/2] chore: change dpx to src/diffpy --- {dpx => src/diffpy}/__init__.py | 0 {dpx => src/diffpy}/srxplanargui/__init__.py | 2 +- {dpx => src/diffpy}/srxplanargui/calibration.py | 2 +- {dpx => src/diffpy}/srxplanargui/datacontainer.py | 0 {dpx => src/diffpy}/srxplanargui/gitarchive.cfg | 0 {dpx => src/diffpy}/srxplanargui/help.py | 0 {dpx => src/diffpy}/srxplanargui/imageplot.py | 0 {dpx => src/diffpy}/srxplanargui/images/01.png | Bin {dpx => src/diffpy}/srxplanargui/images/02.png | Bin {dpx => src/diffpy}/srxplanargui/images/03.png | Bin {dpx => src/diffpy}/srxplanargui/images/04.png | Bin {dpx => src/diffpy}/srxplanargui/images/05.png | Bin {dpx => src/diffpy}/srxplanargui/images/06.png | Bin {dpx => src/diffpy}/srxplanargui/images/07.png | Bin {dpx => src/diffpy}/srxplanargui/images/08.png | Bin {dpx => src/diffpy}/srxplanargui/images/09.png | Bin {dpx => src/diffpy}/srxplanargui/images/10.png | Bin {dpx => src/diffpy}/srxplanargui/images/11.png | Bin {dpx => src/diffpy}/srxplanargui/images/12.png | Bin {dpx => src/diffpy}/srxplanargui/images/13.png | Bin {dpx => src/diffpy}/srxplanargui/images/14.png | Bin {dpx => src/diffpy}/srxplanargui/images/15.png | Bin {dpx => src/diffpy}/srxplanargui/images/16.png | Bin {dpx => src/diffpy}/srxplanargui/images/17.png | Bin {dpx => src/diffpy}/srxplanargui/images/18.png | Bin {dpx => src/diffpy}/srxplanargui/images/19.png | Bin {dpx => src/diffpy}/srxplanargui/images/20.png | Bin {dpx => src/diffpy}/srxplanargui/images/21.png | Bin {dpx => src/diffpy}/srxplanargui/images/22.png | Bin .../diffpy}/srxplanargui/images/gitarchive.cfg | 0 {dpx => src/diffpy}/srxplanargui/images/icon.ico | Bin {dpx => src/diffpy}/srxplanargui/images/icon.png | Bin {dpx => src/diffpy}/srxplanargui/live.py | 10 +++++----- {dpx => src/diffpy}/srxplanargui/selectfiles.py | 6 +++--- {dpx => src/diffpy}/srxplanargui/srxconfig.py | 0 {dpx => src/diffpy}/srxplanargui/srxgui.py | 8 ++++---- {dpx => src/diffpy}/srxplanargui/srxguiapp.py | 4 ++-- {dpx => src/diffpy}/srxplanargui/version.py | 0 38 files changed, 16 insertions(+), 16 deletions(-) rename {dpx => src/diffpy}/__init__.py (100%) rename {dpx => src/diffpy}/srxplanargui/__init__.py (91%) rename {dpx => src/diffpy}/srxplanargui/calibration.py (99%) rename {dpx => src/diffpy}/srxplanargui/datacontainer.py (100%) rename {dpx => src/diffpy}/srxplanargui/gitarchive.cfg (100%) rename {dpx => src/diffpy}/srxplanargui/help.py (100%) rename {dpx => src/diffpy}/srxplanargui/imageplot.py (100%) rename {dpx => src/diffpy}/srxplanargui/images/01.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/02.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/03.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/04.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/05.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/06.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/07.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/08.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/09.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/10.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/11.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/12.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/13.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/14.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/15.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/16.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/17.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/18.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/19.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/20.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/21.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/22.png (100%) rename {dpx => src/diffpy}/srxplanargui/images/gitarchive.cfg (100%) rename {dpx => src/diffpy}/srxplanargui/images/icon.ico (100%) rename {dpx => src/diffpy}/srxplanargui/images/icon.png (100%) rename {dpx => src/diffpy}/srxplanargui/live.py (94%) rename {dpx => src/diffpy}/srxplanargui/selectfiles.py (98%) rename {dpx => src/diffpy}/srxplanargui/srxconfig.py (100%) rename {dpx => src/diffpy}/srxplanargui/srxgui.py (97%) rename {dpx => src/diffpy}/srxplanargui/srxguiapp.py (92%) rename {dpx => src/diffpy}/srxplanargui/version.py (100%) diff --git a/dpx/__init__.py b/src/diffpy/__init__.py similarity index 100% rename from dpx/__init__.py rename to src/diffpy/__init__.py diff --git a/dpx/srxplanargui/__init__.py b/src/diffpy/srxplanargui/__init__.py similarity index 91% rename from dpx/srxplanargui/__init__.py rename to src/diffpy/srxplanargui/__init__.py index 1985b91..e3c8752 100755 --- a/dpx/srxplanargui/__init__.py +++ b/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 diff --git a/dpx/srxplanargui/calibration.py b/src/diffpy/srxplanargui/calibration.py similarity index 99% rename from dpx/srxplanargui/calibration.py rename to src/diffpy/srxplanargui/calibration.py index 579babd..bbe9b1e 100644 --- a/dpx/srxplanargui/calibration.py +++ b/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 diff --git a/dpx/srxplanargui/datacontainer.py b/src/diffpy/srxplanargui/datacontainer.py similarity index 100% rename from dpx/srxplanargui/datacontainer.py rename to src/diffpy/srxplanargui/datacontainer.py diff --git a/dpx/srxplanargui/gitarchive.cfg b/src/diffpy/srxplanargui/gitarchive.cfg similarity index 100% rename from dpx/srxplanargui/gitarchive.cfg rename to src/diffpy/srxplanargui/gitarchive.cfg diff --git a/dpx/srxplanargui/help.py b/src/diffpy/srxplanargui/help.py similarity index 100% rename from dpx/srxplanargui/help.py rename to src/diffpy/srxplanargui/help.py diff --git a/dpx/srxplanargui/imageplot.py b/src/diffpy/srxplanargui/imageplot.py similarity index 100% rename from dpx/srxplanargui/imageplot.py rename to src/diffpy/srxplanargui/imageplot.py diff --git a/dpx/srxplanargui/images/01.png b/src/diffpy/srxplanargui/images/01.png similarity index 100% rename from dpx/srxplanargui/images/01.png rename to src/diffpy/srxplanargui/images/01.png diff --git a/dpx/srxplanargui/images/02.png b/src/diffpy/srxplanargui/images/02.png similarity index 100% rename from dpx/srxplanargui/images/02.png rename to src/diffpy/srxplanargui/images/02.png diff --git a/dpx/srxplanargui/images/03.png b/src/diffpy/srxplanargui/images/03.png similarity index 100% rename from dpx/srxplanargui/images/03.png rename to src/diffpy/srxplanargui/images/03.png diff --git a/dpx/srxplanargui/images/04.png b/src/diffpy/srxplanargui/images/04.png similarity index 100% rename from dpx/srxplanargui/images/04.png rename to src/diffpy/srxplanargui/images/04.png diff --git a/dpx/srxplanargui/images/05.png b/src/diffpy/srxplanargui/images/05.png similarity index 100% rename from dpx/srxplanargui/images/05.png rename to src/diffpy/srxplanargui/images/05.png diff --git a/dpx/srxplanargui/images/06.png b/src/diffpy/srxplanargui/images/06.png similarity index 100% rename from dpx/srxplanargui/images/06.png rename to src/diffpy/srxplanargui/images/06.png diff --git a/dpx/srxplanargui/images/07.png b/src/diffpy/srxplanargui/images/07.png similarity index 100% rename from dpx/srxplanargui/images/07.png rename to src/diffpy/srxplanargui/images/07.png diff --git a/dpx/srxplanargui/images/08.png b/src/diffpy/srxplanargui/images/08.png similarity index 100% rename from dpx/srxplanargui/images/08.png rename to src/diffpy/srxplanargui/images/08.png diff --git a/dpx/srxplanargui/images/09.png b/src/diffpy/srxplanargui/images/09.png similarity index 100% rename from dpx/srxplanargui/images/09.png rename to src/diffpy/srxplanargui/images/09.png diff --git a/dpx/srxplanargui/images/10.png b/src/diffpy/srxplanargui/images/10.png similarity index 100% rename from dpx/srxplanargui/images/10.png rename to src/diffpy/srxplanargui/images/10.png diff --git a/dpx/srxplanargui/images/11.png b/src/diffpy/srxplanargui/images/11.png similarity index 100% rename from dpx/srxplanargui/images/11.png rename to src/diffpy/srxplanargui/images/11.png diff --git a/dpx/srxplanargui/images/12.png b/src/diffpy/srxplanargui/images/12.png similarity index 100% rename from dpx/srxplanargui/images/12.png rename to src/diffpy/srxplanargui/images/12.png diff --git a/dpx/srxplanargui/images/13.png b/src/diffpy/srxplanargui/images/13.png similarity index 100% rename from dpx/srxplanargui/images/13.png rename to src/diffpy/srxplanargui/images/13.png diff --git a/dpx/srxplanargui/images/14.png b/src/diffpy/srxplanargui/images/14.png similarity index 100% rename from dpx/srxplanargui/images/14.png rename to src/diffpy/srxplanargui/images/14.png diff --git a/dpx/srxplanargui/images/15.png b/src/diffpy/srxplanargui/images/15.png similarity index 100% rename from dpx/srxplanargui/images/15.png rename to src/diffpy/srxplanargui/images/15.png diff --git a/dpx/srxplanargui/images/16.png b/src/diffpy/srxplanargui/images/16.png similarity index 100% rename from dpx/srxplanargui/images/16.png rename to src/diffpy/srxplanargui/images/16.png diff --git a/dpx/srxplanargui/images/17.png b/src/diffpy/srxplanargui/images/17.png similarity index 100% rename from dpx/srxplanargui/images/17.png rename to src/diffpy/srxplanargui/images/17.png diff --git a/dpx/srxplanargui/images/18.png b/src/diffpy/srxplanargui/images/18.png similarity index 100% rename from dpx/srxplanargui/images/18.png rename to src/diffpy/srxplanargui/images/18.png diff --git a/dpx/srxplanargui/images/19.png b/src/diffpy/srxplanargui/images/19.png similarity index 100% rename from dpx/srxplanargui/images/19.png rename to src/diffpy/srxplanargui/images/19.png diff --git a/dpx/srxplanargui/images/20.png b/src/diffpy/srxplanargui/images/20.png similarity index 100% rename from dpx/srxplanargui/images/20.png rename to src/diffpy/srxplanargui/images/20.png diff --git a/dpx/srxplanargui/images/21.png b/src/diffpy/srxplanargui/images/21.png similarity index 100% rename from dpx/srxplanargui/images/21.png rename to src/diffpy/srxplanargui/images/21.png diff --git a/dpx/srxplanargui/images/22.png b/src/diffpy/srxplanargui/images/22.png similarity index 100% rename from dpx/srxplanargui/images/22.png rename to src/diffpy/srxplanargui/images/22.png diff --git a/dpx/srxplanargui/images/gitarchive.cfg b/src/diffpy/srxplanargui/images/gitarchive.cfg similarity index 100% rename from dpx/srxplanargui/images/gitarchive.cfg rename to src/diffpy/srxplanargui/images/gitarchive.cfg diff --git a/dpx/srxplanargui/images/icon.ico b/src/diffpy/srxplanargui/images/icon.ico similarity index 100% rename from dpx/srxplanargui/images/icon.ico rename to src/diffpy/srxplanargui/images/icon.ico diff --git a/dpx/srxplanargui/images/icon.png b/src/diffpy/srxplanargui/images/icon.png similarity index 100% rename from dpx/srxplanargui/images/icon.png rename to src/diffpy/srxplanargui/images/icon.png diff --git a/dpx/srxplanargui/live.py b/src/diffpy/srxplanargui/live.py similarity index 94% rename from dpx/srxplanargui/live.py rename to src/diffpy/srxplanargui/live.py index f3b165f..63dddd6 100644 --- a/dpx/srxplanargui/live.py +++ b/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 diff --git a/dpx/srxplanargui/selectfiles.py b/src/diffpy/srxplanargui/selectfiles.py similarity index 98% rename from dpx/srxplanargui/selectfiles.py rename to src/diffpy/srxplanargui/selectfiles.py index bb63137..8cdc340 100644 --- a/dpx/srxplanargui/selectfiles.py +++ b/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 ------------------------------ diff --git a/dpx/srxplanargui/srxconfig.py b/src/diffpy/srxplanargui/srxconfig.py similarity index 100% rename from dpx/srxplanargui/srxconfig.py rename to src/diffpy/srxplanargui/srxconfig.py diff --git a/dpx/srxplanargui/srxgui.py b/src/diffpy/srxplanargui/srxgui.py similarity index 97% rename from dpx/srxplanargui/srxgui.py rename to src/diffpy/srxplanargui/srxgui.py index 5808087..39b4f00 100644 --- a/dpx/srxplanargui/srxgui.py +++ b/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): diff --git a/dpx/srxplanargui/srxguiapp.py b/src/diffpy/srxplanargui/srxguiapp.py similarity index 92% rename from dpx/srxplanargui/srxguiapp.py rename to src/diffpy/srxplanargui/srxguiapp.py index ae7981f..ce913a5 100644 --- a/dpx/srxplanargui/srxguiapp.py +++ b/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) diff --git a/dpx/srxplanargui/version.py b/src/diffpy/srxplanargui/version.py similarity index 100% rename from dpx/srxplanargui/version.py rename to src/diffpy/srxplanargui/version.py From 87a316cdd90fda348ef305c296610590cf1aa7e4 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Sat, 16 Aug 2025 02:03:14 -0400 Subject: [PATCH 2/2] chore: modify project script and 'where' in pyproject.toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 38f8c47..e21b5c8 100644 --- a/pyproject.toml +++ b/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)