From b7021fe463ad54c090d2f77e03a7e25c1e243906 Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Thu, 18 Sep 2025 20:39:05 -0500 Subject: [PATCH 1/2] Remove mac static GSL linking logic, use shared. Add gsl to conda requirements. Change doc to docs for skpkg standard. --- {doc => docs}/Makefile | 0 {doc => docs}/make.bat | 0 {doc => docs}/source/_static/.placeholder | 0 {doc => docs}/source/api/diffpy.pdffit2.rst | 0 {doc => docs}/source/conf.py | 0 {doc => docs}/source/examples.rst | 0 {doc => docs}/source/examples/Ni-xray.gr | 0 {doc => docs}/source/examples/Ni.stru | 0 .../source/examples/Ni_calculation.py | 0 .../source/examples/Ni_refinement.py | 0 {doc => docs}/source/index.rst | 0 {doc => docs}/source/license.rst | 0 {doc => docs}/source/release.rst | 0 news/build.rst | 24 +++++++++++++++++++ requirements/conda.txt | 1 + setup.py | 16 +------------ 16 files changed, 26 insertions(+), 15 deletions(-) rename {doc => docs}/Makefile (100%) rename {doc => docs}/make.bat (100%) rename {doc => docs}/source/_static/.placeholder (100%) rename {doc => docs}/source/api/diffpy.pdffit2.rst (100%) rename {doc => docs}/source/conf.py (100%) rename {doc => docs}/source/examples.rst (100%) rename {doc => docs}/source/examples/Ni-xray.gr (100%) rename {doc => docs}/source/examples/Ni.stru (100%) rename {doc => docs}/source/examples/Ni_calculation.py (100%) rename {doc => docs}/source/examples/Ni_refinement.py (100%) rename {doc => docs}/source/index.rst (100%) rename {doc => docs}/source/license.rst (100%) rename {doc => docs}/source/release.rst (100%) create mode 100644 news/build.rst diff --git a/doc/Makefile b/docs/Makefile similarity index 100% rename from doc/Makefile rename to docs/Makefile diff --git a/doc/make.bat b/docs/make.bat similarity index 100% rename from doc/make.bat rename to docs/make.bat diff --git a/doc/source/_static/.placeholder b/docs/source/_static/.placeholder similarity index 100% rename from doc/source/_static/.placeholder rename to docs/source/_static/.placeholder diff --git a/doc/source/api/diffpy.pdffit2.rst b/docs/source/api/diffpy.pdffit2.rst similarity index 100% rename from doc/source/api/diffpy.pdffit2.rst rename to docs/source/api/diffpy.pdffit2.rst diff --git a/doc/source/conf.py b/docs/source/conf.py similarity index 100% rename from doc/source/conf.py rename to docs/source/conf.py diff --git a/doc/source/examples.rst b/docs/source/examples.rst similarity index 100% rename from doc/source/examples.rst rename to docs/source/examples.rst diff --git a/doc/source/examples/Ni-xray.gr b/docs/source/examples/Ni-xray.gr similarity index 100% rename from doc/source/examples/Ni-xray.gr rename to docs/source/examples/Ni-xray.gr diff --git a/doc/source/examples/Ni.stru b/docs/source/examples/Ni.stru similarity index 100% rename from doc/source/examples/Ni.stru rename to docs/source/examples/Ni.stru diff --git a/doc/source/examples/Ni_calculation.py b/docs/source/examples/Ni_calculation.py similarity index 100% rename from doc/source/examples/Ni_calculation.py rename to docs/source/examples/Ni_calculation.py diff --git a/doc/source/examples/Ni_refinement.py b/docs/source/examples/Ni_refinement.py similarity index 100% rename from doc/source/examples/Ni_refinement.py rename to docs/source/examples/Ni_refinement.py diff --git a/doc/source/index.rst b/docs/source/index.rst similarity index 100% rename from doc/source/index.rst rename to docs/source/index.rst diff --git a/doc/source/license.rst b/docs/source/license.rst similarity index 100% rename from doc/source/license.rst rename to docs/source/license.rst diff --git a/doc/source/release.rst b/docs/source/release.rst similarity index 100% rename from doc/source/release.rst rename to docs/source/release.rst diff --git a/news/build.rst b/news/build.rst new file mode 100644 index 00000000..3e18e755 --- /dev/null +++ b/news/build.rst @@ -0,0 +1,24 @@ +**Added:** + +* Add gsl to conda requirements. + +**Changed:** + +* Remove mac static GSL linking; always link to shared GSL. +* Change doc to docs for skpkg standard. + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/requirements/conda.txt b/requirements/conda.txt index 9cc306b0..0668b5ee 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1 +1,2 @@ diffpy.structure +gsl diff --git a/setup.py b/setup.py index 57e28713..9a334a8e 100644 --- a/setup.py +++ b/setup.py @@ -157,11 +157,7 @@ def create_extensions(): except EnvironmentError: return [] - # On macOS, dynamic linking may not be needed - if sys.platform == "darwin": - libraries = [] - else: - libraries = ["gsl"] + libraries = ["gsl"] include_dirs = [MYDIR] + gcfg["include_dirs"] library_dirs = gcfg["library_dirs"] @@ -180,16 +176,6 @@ def create_extensions(): "-funroll-loops", "-ffast-math", ] - # Check for static GSL libraries and add them if found. - static_libs = [ - os.path.join(p, "libgsl.a") - for p in gcfg["library_dirs"] - if os.path.isfile(os.path.join(p, "libgsl.a")) - ] - if static_libs: - extra_objects += static_libs - # Use static linking: remove "-lgsl" to avoid dynamic linking conflicts. - libraries = [] elif compiler_type == "msvc": define_macros += [("_USE_MATH_DEFINES", None)] extra_compile_args = ["/EHs"] From adc03f4e466e02878bd32d96f94c75a509f0c20a Mon Sep 17 00:00:00 2001 From: Tieqiong Zhang Date: Thu, 18 Sep 2025 21:53:22 -0500 Subject: [PATCH 2/2] rename requirements/test.txt to tests --- requirements/{test.txt => tests.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename requirements/{test.txt => tests.txt} (100%) diff --git a/requirements/test.txt b/requirements/tests.txt similarity index 100% rename from requirements/test.txt rename to requirements/tests.txt