From 98ae03557f96c4359448ced0f5ed717163301332 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Sat, 16 Aug 2025 01:30:46 -0400 Subject: [PATCH 1/3] chore: change dpx to src/diffpy --- {dpx => src/diffpy}/__init__.py | 0 {dpx => src/diffpy}/confutils/__init__.py | 4 ++-- {dpx => src/diffpy}/confutils/config.py | 2 +- {dpx => src/diffpy}/confutils/configtraits.py | 4 ++-- {dpx => src/diffpy}/confutils/gitarchive.cfg | 0 {dpx => src/diffpy}/confutils/tools.py | 0 {dpx => src/diffpy}/confutils/version.py | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename {dpx => src/diffpy}/__init__.py (100%) rename {dpx => src/diffpy}/confutils/__init__.py (87%) rename {dpx => src/diffpy}/confutils/config.py (99%) rename {dpx => src/diffpy}/confutils/configtraits.py (98%) rename {dpx => src/diffpy}/confutils/gitarchive.cfg (100%) rename {dpx => src/diffpy}/confutils/tools.py (100%) rename {dpx => src/diffpy}/confutils/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/confutils/__init__.py b/src/diffpy/confutils/__init__.py similarity index 87% rename from dpx/confutils/__init__.py rename to src/diffpy/confutils/__init__.py index 8e62eb1..7541012 100644 --- a/dpx/confutils/__init__.py +++ b/src/diffpy/confutils/__init__.py @@ -13,10 +13,10 @@ ############################################################################## # package version -from dpx.confutils.version import __version__ +from diffpy.confutils.version import __version__ # some convenience imports -from dpx.confutils.config import ConfigBase, ConfigBase +from diffpy.confutils.config import ConfigBase, ConfigBase # unit tests def test(): diff --git a/dpx/confutils/config.py b/src/diffpy/confutils/config.py similarity index 99% rename from dpx/confutils/config.py rename to src/diffpy/confutils/config.py index f784e7f..4d8d6e3 100644 --- a/dpx/confutils/config.py +++ b/src/diffpy/confutils/config.py @@ -33,7 +33,7 @@ except: from ordereddict import OrderedDict -from dpx.confutils.tools import _configPropertyRad, _configPropertyR, \ +from diffpy.confutils.tools import _configPropertyRad, _configPropertyR, \ _configPropertyRW, str2bool, opt2Str, str2Opt, StrConv, FakeConfigFile class ConfigBase(object): diff --git a/dpx/confutils/configtraits.py b/src/diffpy/confutils/configtraits.py similarity index 98% rename from dpx/confutils/configtraits.py rename to src/diffpy/confutils/configtraits.py index d80d04c..f969e2a 100644 --- a/dpx/confutils/configtraits.py +++ b/src/diffpy/confutils/configtraits.py @@ -34,9 +34,9 @@ Event, CFloat, CInt, on_trait_change from traitsui.api import Item, Group, View -from dpx.confutils.tools import _configPropertyRad, _configPropertyR, _configPropertyRW, \ +from diffpy.confutils.tools import _configPropertyRad, _configPropertyR, _configPropertyRW, \ str2bool, opt2Str, str2Opt, StrConv -from dpx.confutils.config import ConfigBase +from diffpy.confutils.config import ConfigBase class ConfigBaseTraits(HasTraits, ConfigBase): ''' diff --git a/dpx/confutils/gitarchive.cfg b/src/diffpy/confutils/gitarchive.cfg similarity index 100% rename from dpx/confutils/gitarchive.cfg rename to src/diffpy/confutils/gitarchive.cfg diff --git a/dpx/confutils/tools.py b/src/diffpy/confutils/tools.py similarity index 100% rename from dpx/confutils/tools.py rename to src/diffpy/confutils/tools.py diff --git a/dpx/confutils/version.py b/src/diffpy/confutils/version.py similarity index 100% rename from dpx/confutils/version.py rename to src/diffpy/confutils/version.py From 274efae1bf7696418b80523faebac42b98618d1a Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Sat, 16 Aug 2025 01:35:11 -0400 Subject: [PATCH 2/3] chore: rename confutils to srxconfutils --- src/diffpy/{confutils => srxconfutils}/__init__.py | 4 ++-- src/diffpy/{confutils => srxconfutils}/config.py | 2 +- src/diffpy/{confutils => srxconfutils}/configtraits.py | 4 ++-- src/diffpy/{confutils => srxconfutils}/gitarchive.cfg | 0 src/diffpy/{confutils => srxconfutils}/tools.py | 0 src/diffpy/{confutils => srxconfutils}/version.py | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename src/diffpy/{confutils => srxconfutils}/__init__.py (87%) rename src/diffpy/{confutils => srxconfutils}/config.py (99%) rename src/diffpy/{confutils => srxconfutils}/configtraits.py (98%) rename src/diffpy/{confutils => srxconfutils}/gitarchive.cfg (100%) rename src/diffpy/{confutils => srxconfutils}/tools.py (100%) rename src/diffpy/{confutils => srxconfutils}/version.py (100%) diff --git a/src/diffpy/confutils/__init__.py b/src/diffpy/srxconfutils/__init__.py similarity index 87% rename from src/diffpy/confutils/__init__.py rename to src/diffpy/srxconfutils/__init__.py index 7541012..7b91ed3 100644 --- a/src/diffpy/confutils/__init__.py +++ b/src/diffpy/srxconfutils/__init__.py @@ -13,10 +13,10 @@ ############################################################################## # package version -from diffpy.confutils.version import __version__ +from diffpy.srxconfutils.version import __version__ # some convenience imports -from diffpy.confutils.config import ConfigBase, ConfigBase +from diffpy.srxconfutils.config import ConfigBase, ConfigBase # unit tests def test(): diff --git a/src/diffpy/confutils/config.py b/src/diffpy/srxconfutils/config.py similarity index 99% rename from src/diffpy/confutils/config.py rename to src/diffpy/srxconfutils/config.py index 4d8d6e3..c508365 100644 --- a/src/diffpy/confutils/config.py +++ b/src/diffpy/srxconfutils/config.py @@ -33,7 +33,7 @@ except: from ordereddict import OrderedDict -from diffpy.confutils.tools import _configPropertyRad, _configPropertyR, \ +from diffpy.srxconfutils.tools import _configPropertyRad, _configPropertyR, \ _configPropertyRW, str2bool, opt2Str, str2Opt, StrConv, FakeConfigFile class ConfigBase(object): diff --git a/src/diffpy/confutils/configtraits.py b/src/diffpy/srxconfutils/configtraits.py similarity index 98% rename from src/diffpy/confutils/configtraits.py rename to src/diffpy/srxconfutils/configtraits.py index f969e2a..502f63e 100644 --- a/src/diffpy/confutils/configtraits.py +++ b/src/diffpy/srxconfutils/configtraits.py @@ -34,9 +34,9 @@ Event, CFloat, CInt, on_trait_change from traitsui.api import Item, Group, View -from diffpy.confutils.tools import _configPropertyRad, _configPropertyR, _configPropertyRW, \ +from diffpy.srxconfutils.tools import _configPropertyRad, _configPropertyR, _configPropertyRW, \ str2bool, opt2Str, str2Opt, StrConv -from diffpy.confutils.config import ConfigBase +from diffpy.srxconfutils.config import ConfigBase class ConfigBaseTraits(HasTraits, ConfigBase): ''' diff --git a/src/diffpy/confutils/gitarchive.cfg b/src/diffpy/srxconfutils/gitarchive.cfg similarity index 100% rename from src/diffpy/confutils/gitarchive.cfg rename to src/diffpy/srxconfutils/gitarchive.cfg diff --git a/src/diffpy/confutils/tools.py b/src/diffpy/srxconfutils/tools.py similarity index 100% rename from src/diffpy/confutils/tools.py rename to src/diffpy/srxconfutils/tools.py diff --git a/src/diffpy/confutils/version.py b/src/diffpy/srxconfutils/version.py similarity index 100% rename from src/diffpy/confutils/version.py rename to src/diffpy/srxconfutils/version.py From 727d2c03b517eff219e100790f92d94401b775a6 Mon Sep 17 00:00:00 2001 From: Zhi Ming Xu Date: Sat, 16 Aug 2025 01:41:17 -0400 Subject: [PATCH 3/3] chore: change dpx to src in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 94aa589..918ff52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,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)