From a383c379c188c7f80184ad4c936b2ecf9c785b90 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 11 May 2026 18:41:05 -0400 Subject: [PATCH 1/4] build: remove gsl as the dependency in the build --- requirements/conda.txt | 2 +- requirements/pip.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/conda.txt b/requirements/conda.txt index a77f5f9..1ddd28c 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,4 +1,4 @@ numpy diffpy.pdffit2 diffpy.structure -gsl + diff --git a/requirements/pip.txt b/requirements/pip.txt index f3657e3..92111f9 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,4 +1,3 @@ numpy -gsl diffpy.pdffit2 diffpy.structure From e31e3a528557da7640676d1d6ad66a2a3faabb43 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 11 May 2026 18:45:09 -0400 Subject: [PATCH 2/4] chore: add news --- news/dependency-build-fix.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/dependency-build-fix.rst diff --git a/news/dependency-build-fix.rst b/news/dependency-build-fix.rst new file mode 100644 index 0000000..ac7c8fa --- /dev/null +++ b/news/dependency-build-fix.rst @@ -0,0 +1,23 @@ +**Added:** + +* No News Added: remove dependency for gsl + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* From aa7bf1e7b4d98c9d4abeaa808af4f9155e8936f7 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 11 May 2026 19:22:40 -0400 Subject: [PATCH 3/4] build: add path extension in the namespace --- src/diffpy/__init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/diffpy/__init__.py b/src/diffpy/__init__.py index c82d1a5..fc59fa4 100644 --- a/src/diffpy/__init__.py +++ b/src/diffpy/__init__.py @@ -13,3 +13,14 @@ # See LICENSE.rst for license information. # ############################################################################## +"""diffpy - tools for structure analysis by diffraction. + +Blank namespace package. +""" + + +from pkgutil import extend_path + +__path__ = extend_path(__path__, __name__) + +# End of file \ No newline at end of file From 4c0ae3a68cfe1e50a848450b0ab70509ee6f1710 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 11 May 2026 21:34:47 -0400 Subject: [PATCH 4/4] chore: revert change in __init__py --- CHANGELOG.rst | 1 - requirements/conda.txt | 1 - src/diffpy/__init__.py | 11 ----------- 3 files changed, 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 489d318..8ed94ed 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,4 +19,3 @@ Release notes * Updated from Python 2.6-2.7 to Python 3.11-3.13 * Support ``scikit-package`` Level 5 standard (https://scikit-package.github.io/scikit-package/). - diff --git a/requirements/conda.txt b/requirements/conda.txt index 1ddd28c..92111f9 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,4 +1,3 @@ numpy diffpy.pdffit2 diffpy.structure - diff --git a/src/diffpy/__init__.py b/src/diffpy/__init__.py index fc59fa4..c82d1a5 100644 --- a/src/diffpy/__init__.py +++ b/src/diffpy/__init__.py @@ -13,14 +13,3 @@ # See LICENSE.rst for license information. # ############################################################################## -"""diffpy - tools for structure analysis by diffraction. - -Blank namespace package. -""" - - -from pkgutil import extend_path - -__path__ = extend_path(__path__, __name__) - -# End of file \ No newline at end of file