diffpy · sbillinge · Sep 19, 2025 · Sep 19, 2025 · Sep 19, 2025
diff --git a/doc/Makefile → docs/Makefile b/doc/Makefile → docs/Makefile
diff --git a/doc/make.bat → docs/make.bat b/doc/make.bat → docs/make.bat
diff --git a/doc/source/_static/.placeholder → docs/source/_static/.placeholder b/doc/source/_static/.placeholder → docs/source/_static/.placeholder
diff --git a/doc/source/api/diffpy.pdffit2.rst → docs/source/api/diffpy.pdffit2.rst b/doc/source/api/diffpy.pdffit2.rst → docs/source/api/diffpy.pdffit2.rst
diff --git a/doc/source/conf.py → docs/source/conf.py b/doc/source/conf.py → docs/source/conf.py
diff --git a/doc/source/examples.rst → docs/source/examples.rst b/doc/source/examples.rst → docs/source/examples.rst
diff --git a/doc/source/examples/Ni-xray.gr → docs/source/examples/Ni-xray.gr b/doc/source/examples/Ni-xray.gr → docs/source/examples/Ni-xray.gr
diff --git a/doc/source/examples/Ni.stru → docs/source/examples/Ni.stru b/doc/source/examples/Ni.stru → docs/source/examples/Ni.stru
diff --git a/doc/source/examples/Ni_calculation.py → docs/source/examples/Ni_calculation.py b/doc/source/examples/Ni_calculation.py → docs/source/examples/Ni_calculation.py
diff --git a/doc/source/examples/Ni_refinement.py → docs/source/examples/Ni_refinement.py b/doc/source/examples/Ni_refinement.py → docs/source/examples/Ni_refinement.py
diff --git a/doc/source/index.rst → docs/source/index.rst b/doc/source/index.rst → docs/source/index.rst
diff --git a/doc/source/license.rst → docs/source/license.rst b/doc/source/license.rst → docs/source/license.rst
diff --git a/doc/source/release.rst → docs/source/release.rst b/doc/source/release.rst → docs/source/release.rst
diff --git a/news/build.rst 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:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/requirements/conda.txt b/requirements/conda.txt
@@ -1 +1,2 @@
 diffpy.structure
+gsl
diff --git a/requirements/test.txt → requirements/tests.txt b/requirements/test.txt → requirements/tests.txt
diff --git 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"]