diffpy · sbillinge · Jul 19, 2025 · Jul 19, 2025 · Jul 19, 2025 · Jul 19, 2025
diff --git a/.flake8 b/.flake8
@@ -6,7 +6,7 @@ exclude =
     __pycache__,
     build,
     dist,
-    doc/source/conf.py
+    docs/source/conf.py
 max-line-length = 79
 # Ignore some style 'errors' produced while formatting by 'black'
 # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -10,4 +10,4 @@ python:
     - requirements: requirements/docs.txt
 
 sphinx:
-  configuration: doc/source/conf.py
+  configuration: docs/source/conf.py
diff --git a/LICENSE.rst b/LICENSE.rst
@@ -1,26 +1,22 @@
 OPEN SOURCE LICENSE AGREEMENT
 =============================
 
-Copyright (c) 2009-2011, University of Tennessee
-Copyright (c) 1989, 1991 Free Software Foundation, Inc.
-Copyright (c) 2006, The Regents of the University of California through
-    Lawrence Berkeley National Laboratory
-Copyright (c) 2014, Australian Synchrotron Research Program Inc., ("ASRP")
-Copyright (c) 2006-2007, Board of Trustees of Michigan State University
-Copyright (c) 2008-2012, The Trustees of Columbia University in the City
-    of New York
-Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National
-    Laboratory
-Copyright (c) 2020-2025, The Trustees of Columbia University in the City
-    of New York
+- Copyright (c) 2009-2011, University of Tennessee
+- Copyright (c) 1989, 1991 Free Software Foundation, Inc.
+- Copyright (c) 2006, The Regents of the University of California through Lawrence Berkeley National Laboratory
+- Copyright (c) 2014, Australian Synchrotron Research Program Inc., ("ASRP")
+- Copyright (c) 2006-2007, Board of Trustees of Michigan State University
+- Copyright (c) 2008-2012, The Trustees of Columbia University in the City of New York
+- Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National Laboratory
+- Copyright (c) 2020-2025, The Trustees of Columbia University in the City of New York
 
 
 The "DiffPy-CMI" is distributed subject to the following license conditions:
 
 
 SOFTWARE LICENSE AGREEMENT
 
-    Software: DiffPy-CMI
+**Software:** DiffPy-CMI
 
 
 (1) The "Software", below, refers to the aforementioned DiffPy-CMI (in either

diff --git a/doc/Makefile → docs/Makefile b/doc/Makefile → docs/Makefile
diff --git a/doc/examples/README → docs/examples/README b/doc/examples/README → docs/examples/README
@@ -48,7 +48,7 @@ The examples described below will go into detail about each of these points.
 
 ## Examples
 
-The following examples are contained in the _doc/examples/_ directory of the
+The following examples are contained in the _docs/examples/_ directory of the
 SrFit source distribution. They can be downloaded from
 http://dev.danse.us/packages/srfit_examples-alpha9.zip
 

diff --git a/doc/examples/coreshellnp.py → docs/examples/coreshellnp.py b/doc/examples/coreshellnp.py → docs/examples/coreshellnp.py
diff --git a/doc/examples/crystalpdf.py → docs/examples/crystalpdf.py b/doc/examples/crystalpdf.py → docs/examples/crystalpdf.py
diff --git a/doc/examples/crystalpdfall.py → docs/examples/crystalpdfall.py b/doc/examples/crystalpdfall.py → docs/examples/crystalpdfall.py
diff --git a/doc/examples/crystalpdfobjcryst.py → docs/examples/crystalpdfobjcryst.py b/doc/examples/crystalpdfobjcryst.py → docs/examples/crystalpdfobjcryst.py
diff --git a/doc/examples/crystalpdftwodata.py → docs/examples/crystalpdftwodata.py b/doc/examples/crystalpdftwodata.py → docs/examples/crystalpdftwodata.py
diff --git a/doc/examples/crystalpdftwophase.py → docs/examples/crystalpdftwophase.py b/doc/examples/crystalpdftwophase.py → docs/examples/crystalpdftwophase.py
diff --git a/doc/examples/data/C60.gr → docs/examples/data/C60.gr b/doc/examples/data/C60.gr → docs/examples/data/C60.gr
diff --git a/doc/examples/data/C60.stru → docs/examples/data/C60.stru b/doc/examples/data/C60.stru → docs/examples/data/C60.stru
diff --git a/doc/examples/data/CdS.cif → docs/examples/data/CdS.cif b/doc/examples/data/CdS.cif → docs/examples/data/CdS.cif
diff --git a/doc/examples/data/CdS_ZnS_nano.gr → docs/examples/data/CdS_ZnS_nano.gr b/doc/examples/data/CdS_ZnS_nano.gr → docs/examples/data/CdS_ZnS_nano.gr
diff --git a/doc/examples/data/ZnS.cif → docs/examples/data/ZnS.cif b/doc/examples/data/ZnS.cif → docs/examples/data/ZnS.cif
diff --git a/doc/examples/data/gaussian.dat → docs/examples/data/gaussian.dat b/doc/examples/data/gaussian.dat → docs/examples/data/gaussian.dat
diff --git a/doc/examples/data/lorentzian.dat → docs/examples/data/lorentzian.dat b/doc/examples/data/lorentzian.dat → docs/examples/data/lorentzian.dat
diff --git a/doc/examples/data/ni-q27r100-neutron.gr → docs/examples/data/ni-q27r100-neutron.gr b/doc/examples/data/ni-q27r100-neutron.gr → docs/examples/data/ni-q27r100-neutron.gr
diff --git a/doc/examples/data/ni-q27r60-xray.gr → docs/examples/data/ni-q27r60-xray.gr b/doc/examples/data/ni-q27r60-xray.gr → docs/examples/data/ni-q27r60-xray.gr
diff --git a/doc/examples/data/ni-q27r60nodg-xray.gr → docs/examples/data/ni-q27r60nodg-xray.gr b/doc/examples/data/ni-q27r60nodg-xray.gr → docs/examples/data/ni-q27r60nodg-xray.gr
diff --git a/doc/examples/data/ni.cif → docs/examples/data/ni.cif b/doc/examples/data/ni.cif → docs/examples/data/ni.cif
diff --git a/doc/examples/data/ni.iq → docs/examples/data/ni.iq b/doc/examples/data/ni.iq → docs/examples/data/ni.iq
diff --git a/doc/examples/data/pb.cif → docs/examples/data/pb.cif b/doc/examples/data/pb.cif → docs/examples/data/pb.cif
diff --git a/doc/examples/data/pb_100.xyz → docs/examples/data/pb_100.xyz b/doc/examples/data/pb_100.xyz → docs/examples/data/pb_100.xyz
diff --git a/doc/examples/data/pb_100_qmax1.iq → docs/examples/data/pb_100_qmax1.iq b/doc/examples/data/pb_100_qmax1.iq → docs/examples/data/pb_100_qmax1.iq
diff --git a/doc/examples/data/pb_100_qmin1.gr → docs/examples/data/pb_100_qmin1.gr b/doc/examples/data/pb_100_qmin1.gr → docs/examples/data/pb_100_qmin1.gr
diff --git a/doc/examples/data/sas_ellipsoid_testdata.txt → .../examples/data/sas_ellipsoid_testdata.txt b/doc/examples/data/sas_ellipsoid_testdata.txt → .../examples/data/sas_ellipsoid_testdata.txt
diff --git a/doc/examples/data/si-q27r60-xray.gr → docs/examples/data/si-q27r60-xray.gr b/doc/examples/data/si-q27r60-xray.gr → docs/examples/data/si-q27r60-xray.gr
diff --git a/doc/examples/data/si.cif → docs/examples/data/si.cif b/doc/examples/data/si.cif → docs/examples/data/si.cif
diff --git a/doc/examples/data/si90ni10-q27r60-xray.gr → docs/examples/data/si90ni10-q27r60-xray.gr b/doc/examples/data/si90ni10-q27r60-xray.gr → docs/examples/data/si90ni10-q27r60-xray.gr
diff --git a/doc/examples/data/threedoublepeaks.dat → docs/examples/data/threedoublepeaks.dat b/doc/examples/data/threedoublepeaks.dat → docs/examples/data/threedoublepeaks.dat
diff --git a/doc/examples/debyemodel.py → docs/examples/debyemodel.py b/doc/examples/debyemodel.py → docs/examples/debyemodel.py
diff --git a/doc/examples/debyemodelII.py → docs/examples/debyemodelII.py b/doc/examples/debyemodelII.py → docs/examples/debyemodelII.py
diff --git a/doc/examples/ellipsoidsas.py → docs/examples/ellipsoidsas.py b/doc/examples/ellipsoidsas.py → docs/examples/ellipsoidsas.py
diff --git a/doc/examples/gaussiangenerator.py → docs/examples/gaussiangenerator.py b/doc/examples/gaussiangenerator.py → docs/examples/gaussiangenerator.py
diff --git a/doc/examples/gaussianrecipe.py → docs/examples/gaussianrecipe.py b/doc/examples/gaussianrecipe.py → docs/examples/gaussianrecipe.py
diff --git a/doc/examples/interface.py → docs/examples/interface.py b/doc/examples/interface.py → docs/examples/interface.py
diff --git a/doc/examples/npintensity.py → docs/examples/npintensity.py b/doc/examples/npintensity.py → docs/examples/npintensity.py
diff --git a/doc/examples/npintensityII.py → docs/examples/npintensityII.py b/doc/examples/npintensityII.py → docs/examples/npintensityII.py
diff --git a/doc/examples/nppdfcrystal.py → docs/examples/nppdfcrystal.py b/doc/examples/nppdfcrystal.py → docs/examples/nppdfcrystal.py
diff --git a/doc/examples/nppdfobjcryst.py → docs/examples/nppdfobjcryst.py b/doc/examples/nppdfobjcryst.py → docs/examples/nppdfobjcryst.py
diff --git a/doc/examples/nppdfsas.py → docs/examples/nppdfsas.py b/doc/examples/nppdfsas.py → docs/examples/nppdfsas.py
diff --git a/doc/examples/simplepdf.py → docs/examples/simplepdf.py b/doc/examples/simplepdf.py → docs/examples/simplepdf.py
diff --git a/doc/examples/simplepdftwophase.py → docs/examples/simplepdftwophase.py b/doc/examples/simplepdftwophase.py → docs/examples/simplepdftwophase.py
diff --git a/doc/examples/simplerecipe.py → docs/examples/simplerecipe.py b/doc/examples/simplerecipe.py → docs/examples/simplerecipe.py
diff --git a/doc/examples/threedoublepeaks.py → docs/examples/threedoublepeaks.py b/doc/examples/threedoublepeaks.py → docs/examples/threedoublepeaks.py
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/.placeholder → docs/source/api/.placeholder b/doc/source/api/.placeholder → docs/source/api/.placeholder
diff --git a/...ce/api/diffpy.srfit.equation.literals.rst → ...ce/api/diffpy.srfit.equation.literals.rst b/...ce/api/diffpy.srfit.equation.literals.rst → ...ce/api/diffpy.srfit.equation.literals.rst
diff --git a/doc/source/api/diffpy.srfit.equation.rst → docs/source/api/diffpy.srfit.equation.rst b/doc/source/api/diffpy.srfit.equation.rst → docs/source/api/diffpy.srfit.equation.rst
diff --git a/...ce/api/diffpy.srfit.equation.visitors.rst → ...ce/api/diffpy.srfit.equation.visitors.rst b/...ce/api/diffpy.srfit.equation.visitors.rst → ...ce/api/diffpy.srfit.equation.visitors.rst
diff --git a/...urce/api/diffpy.srfit.example_package.rst → ...urce/api/diffpy.srfit.example_package.rst b/...urce/api/diffpy.srfit.example_package.rst → ...urce/api/diffpy.srfit.example_package.rst
diff --git a/doc/source/api/diffpy.srfit.fitbase.rst → docs/source/api/diffpy.srfit.fitbase.rst b/doc/source/api/diffpy.srfit.fitbase.rst → docs/source/api/diffpy.srfit.fitbase.rst
diff --git a/doc/source/api/diffpy.srfit.interface.rst → docs/source/api/diffpy.srfit.interface.rst b/doc/source/api/diffpy.srfit.interface.rst → docs/source/api/diffpy.srfit.interface.rst
diff --git a/doc/source/api/diffpy.srfit.pdf.rst → docs/source/api/diffpy.srfit.pdf.rst b/doc/source/api/diffpy.srfit.pdf.rst → docs/source/api/diffpy.srfit.pdf.rst
diff --git a/doc/source/api/diffpy.srfit.rst → docs/source/api/diffpy.srfit.rst b/doc/source/api/diffpy.srfit.rst → docs/source/api/diffpy.srfit.rst
diff --git a/doc/source/api/diffpy.srfit.sas.rst → docs/source/api/diffpy.srfit.sas.rst b/doc/source/api/diffpy.srfit.sas.rst → docs/source/api/diffpy.srfit.sas.rst
diff --git a/doc/source/api/diffpy.srfit.structure.rst → docs/source/api/diffpy.srfit.structure.rst b/doc/source/api/diffpy.srfit.structure.rst → docs/source/api/diffpy.srfit.structure.rst
diff --git a/doc/source/api/diffpy.srfit.util.rst → docs/source/api/diffpy.srfit.util.rst b/doc/source/api/diffpy.srfit.util.rst → docs/source/api/diffpy.srfit.util.rst
diff --git a/doc/source/conf.py → docs/source/conf.py b/doc/source/conf.py → docs/source/conf.py
@@ -141,7 +141,7 @@
     "github_user": "diffpy",
     "github_repo": "diffpy.srfit",
     "github_version": "main",
-    "conf_py_path": "/doc/source/",
+    "conf_py_path": "/docs/source/",
 }
 
 # Theme options are theme-specific and customize the look and feel of a theme

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/coreshellnp.rst → docs/source/examples/coreshellnp.rst b/doc/source/examples/coreshellnp.rst → docs/source/examples/coreshellnp.rst
diff --git a/doc/source/examples/crystalpdf.rst → docs/source/examples/crystalpdf.rst b/doc/source/examples/crystalpdf.rst → docs/source/examples/crystalpdf.rst
diff --git a/doc/source/examples/crystalpdfall.rst → docs/source/examples/crystalpdfall.rst b/doc/source/examples/crystalpdfall.rst → docs/source/examples/crystalpdfall.rst
diff --git a/doc/source/examples/crystalpdfobjcryst.rst → docs/source/examples/crystalpdfobjcryst.rst b/doc/source/examples/crystalpdfobjcryst.rst → docs/source/examples/crystalpdfobjcryst.rst
diff --git a/doc/source/examples/crystalpdftwodata.rst → docs/source/examples/crystalpdftwodata.rst b/doc/source/examples/crystalpdftwodata.rst → docs/source/examples/crystalpdftwodata.rst
diff --git a/doc/source/examples/crystalpdftwophase.rst → docs/source/examples/crystalpdftwophase.rst b/doc/source/examples/crystalpdftwophase.rst → docs/source/examples/crystalpdftwophase.rst
diff --git a/doc/source/examples/debyemodel.rst → docs/source/examples/debyemodel.rst b/doc/source/examples/debyemodel.rst → docs/source/examples/debyemodel.rst
diff --git a/doc/source/examples/debyemodelII.rst → docs/source/examples/debyemodelII.rst b/doc/source/examples/debyemodelII.rst → docs/source/examples/debyemodelII.rst
diff --git a/doc/source/examples/ellipsoidsas.rst → docs/source/examples/ellipsoidsas.rst b/doc/source/examples/ellipsoidsas.rst → docs/source/examples/ellipsoidsas.rst
diff --git a/doc/source/examples/gaussiangenerator.rst → docs/source/examples/gaussiangenerator.rst b/doc/source/examples/gaussiangenerator.rst → docs/source/examples/gaussiangenerator.rst
diff --git a/doc/source/examples/gaussianrecipe.rst → docs/source/examples/gaussianrecipe.rst b/doc/source/examples/gaussianrecipe.rst → docs/source/examples/gaussianrecipe.rst
diff --git a/doc/source/examples/interface.rst → docs/source/examples/interface.rst b/doc/source/examples/interface.rst → docs/source/examples/interface.rst
diff --git a/doc/source/examples/npintensity.rst → docs/source/examples/npintensity.rst b/doc/source/examples/npintensity.rst → docs/source/examples/npintensity.rst
diff --git a/doc/source/examples/npintensityII.rst → docs/source/examples/npintensityII.rst b/doc/source/examples/npintensityII.rst → docs/source/examples/npintensityII.rst
diff --git a/doc/source/examples/nppdfcrystal.rst → docs/source/examples/nppdfcrystal.rst b/doc/source/examples/nppdfcrystal.rst → docs/source/examples/nppdfcrystal.rst
diff --git a/doc/source/examples/nppdfobjcryst.rst → docs/source/examples/nppdfobjcryst.rst b/doc/source/examples/nppdfobjcryst.rst → docs/source/examples/nppdfobjcryst.rst
diff --git a/doc/source/examples/nppdfsas.rst → docs/source/examples/nppdfsas.rst b/doc/source/examples/nppdfsas.rst → docs/source/examples/nppdfsas.rst
diff --git a/doc/source/examples/simplepdf.rst → docs/source/examples/simplepdf.rst b/doc/source/examples/simplepdf.rst → docs/source/examples/simplepdf.rst
diff --git a/doc/source/examples/simplepdftwophase.rst → docs/source/examples/simplepdftwophase.rst b/doc/source/examples/simplepdftwophase.rst → docs/source/examples/simplepdftwophase.rst
diff --git a/doc/source/examples/simplerecipe.rst → docs/source/examples/simplerecipe.rst b/doc/source/examples/simplerecipe.rst → docs/source/examples/simplerecipe.rst
diff --git a/doc/source/extending.rst → docs/source/extending.rst b/doc/source/extending.rst → docs/source/extending.rst
diff --git a/doc/source/img/.placeholder → docs/source/img/.placeholder b/doc/source/img/.placeholder → docs/source/img/.placeholder
diff --git a/doc/source/img/fitting_architecture.dia → docs/source/img/fitting_architecture.dia b/doc/source/img/fitting_architecture.dia → docs/source/img/fitting_architecture.dia
diff --git a/doc/source/img/fitting_architecture.png → docs/source/img/fitting_architecture.png b/doc/source/img/fitting_architecture.png → docs/source/img/fitting_architecture.png
diff --git a/doc/source/img/overview.odg → docs/source/img/overview.odg b/doc/source/img/overview.odg → docs/source/img/overview.odg
diff --git a/doc/source/img/partition_equation.dia → docs/source/img/partition_equation.dia b/doc/source/img/partition_equation.dia → docs/source/img/partition_equation.dia
diff --git a/doc/source/img/partition_equation.png → docs/source/img/partition_equation.png b/doc/source/img/partition_equation.png → docs/source/img/partition_equation.png
diff --git a/doc/source/img/simple_equation.dia → docs/source/img/simple_equation.dia b/doc/source/img/simple_equation.dia → docs/source/img/simple_equation.dia
diff --git a/doc/source/img/simple_equation.png → docs/source/img/simple_equation.png b/doc/source/img/simple_equation.png → docs/source/img/simple_equation.png
diff --git a/doc/source/img/visitor_interaction.dia → docs/source/img/visitor_interaction.dia b/doc/source/img/visitor_interaction.dia → docs/source/img/visitor_interaction.dia
diff --git a/doc/source/img/visitor_interaction.png → docs/source/img/visitor_interaction.png b/doc/source/img/visitor_interaction.png → docs/source/img/visitor_interaction.png
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/doc/source/snippets/.placeholder → docs/source/snippets/.placeholder b/doc/source/snippets/.placeholder → docs/source/snippets/.placeholder
diff --git a/news/license.rst b/news/license.rst
@@ -0,0 +1,24 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* doc/ -> docs/
+* requirements/test.txt -> requirements/tests.txt
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Better license designation in `pyproject.toml`
+
+**Security:**
+
+* <news item>
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ classifiers = [
         'Environment :: Console',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
-        'License :: OSI Approved :: BSD License',
+        'License :: Free To Use But Restricted',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',

diff --git a/requirements/test.txt → requirements/tests.txt b/requirements/test.txt → requirements/tests.txt