From 9276ae46ce04136c02ec4ba3d96b3999c10165b5 Mon Sep 17 00:00:00 2001 From: John Halloran Date: Wed, 11 Mar 2026 19:48:01 -0400 Subject: [PATCH 1/4] fix: remove extraneous files --- my_norm_components.txt | 1052 ---------------------------------------- my_norm_stretch.txt | 2 - my_norm_weights.txt | 2 - 3 files changed, 1056 deletions(-) delete mode 100644 my_norm_components.txt delete mode 100644 my_norm_stretch.txt delete mode 100644 my_norm_weights.txt diff --git a/my_norm_components.txt b/my_norm_components.txt deleted file mode 100644 index 540f1ba..0000000 --- a/my_norm_components.txt +++ /dev/null @@ -1,1052 +0,0 @@ -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -41.3831 0 -98.4541 0 -171.705 0 -164.713 0 -79.5078 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 58.825 -0 143.936 -141.621 207.856 -476.616 236.947 -615.079 338.421 -305.947 406.329 -0 305.113 -0 105.716 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 276.516 -859.672 264.369 -1176.12 190.031 -510.133 0 -114.56 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 39.1189 -0 178.843 -419.997 316.129 -962.191 631.221 -583.532 1025.17 -0 778.32 -0 285.895 -0 126.434 -0 67.3709 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 62.8555 -167.311 0 -105.721 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -70.1269 0 -37.3221 0 -0 0 -0 0 -0 0 -0 34.7973 -0 165.509 -0 1007.36 -1037.98 1441.36 -543.142 1661.61 -270.684 866.551 -704.406 282.81 -620.856 206.542 -326.258 0 -84.7892 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -38.0596 0 -87.5851 0 -140.392 31.3827 -175.569 199.78 -386.742 490.802 -911.528 1022.46 -1252.63 1827.4 -776.196 2149.73 -176.915 1428.1 -0 630.284 -0 266.08 -0 152.631 -0 332.155 -745.301 227.942 -1122.73 0 -504.952 0 -216.831 0 -241.656 0 -127.642 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 109.017 -258.919 92.4745 -336.933 93.165 -219.284 0 -57.5194 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 39.6297 -0 60.3065 -45.2192 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 57.7504 -0 185.745 -0 426.22 -0 559.652 -0 389.677 -0 152.058 -0 49.1209 -0 31.4728 -0 46.0765 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 110.455 -293.394 120.636 -588.242 0 -348.931 0 -80.4055 0 -0 0 -0 0 -0 0 -0 0 -0 30.4438 -0 101.893 -0 177.706 -0 572.263 -362.471 924.522 -310.576 924.27 -165.514 431.966 -158.72 0 -30.0797 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 53.5321 -89.2173 0 -119.969 0 -182.458 0 -139.554 65.0831 -76.7006 60.3236 -59.1149 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -98.8009 0 -196.33 0 -166.908 0 -59.8251 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 78.5492 -0 195.568 -0 357.597 -0 402.989 -0 258.945 -0 92.3519 -0 0 -0 0 -0 0 -0 89.8168 -0 339.221 -94.7015 499.058 -92.0795 415.294 -108.389 184.598 -99.0525 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -34.7038 0 -94.1864 0 -83.025 0 -27.005 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 111.652 -257.973 85.359 -420.541 0 -301.479 0 -186.982 211.692 -287.984 584.829 -312.866 929.88 -125.737 877.031 -0 504.941 -0 236.373 -0 251.533 -356.398 304.078 -734.202 279.746 -622.005 177.453 -311.185 0 -86.7765 0 -24.1886 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 33.125 -0 43.7446 -0 0 -0 0 -0 79.5056 -48.0891 65.6914 -66.4548 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 47.5898 -144.319 63.4342 -358.332 0 -361.93 0 -276.24 0 -205.959 0 -138.375 0 -77.233 0 -0 52.4651 -0 46.1184 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 22.0585 -0 124.655 -0 257.856 -0 277.795 -0 156.452 -0 51.6055 -0 23.6411 -0 35.6662 -0 50.0176 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -48.7386 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 49.8441 -0 88.8086 -0 85.2528 -0 50.7424 -0 0 -0 30.966 -108.622 0 -150.558 0 -113.336 0 -49.5227 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 51.552 -0 151.346 -0 228.716 -0 213.466 -61.3444 104.359 -74.8393 0 -0 0 -0 0 -0 0 -0 0 -0 87.2259 -0 176.879 -0 235.37 -0 242.115 -0 197.064 -0 138.054 -0 124.703 -0 151.402 -0 175.344 -0 152.497 -0 87.8898 -0 39.4761 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 57.2901 -0 66.7006 -0 41.2021 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 40.9068 -0 34.024 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 41.0045 -0 96.6506 -0 115.917 -0 76.7006 -0 45.3546 -75.2088 0 -107.399 0 -80.826 0 -0 31.6062 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 27.0366 -0 0 -0 44.4032 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 32.0659 -0 99.2836 -0 168.904 -0 180.861 -0 131.226 -0 86.3096 -0 74.8389 -0 64.5515 -0 53.2527 -43.0537 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -60.0916 0 -58.9971 0 -29.5889 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 50.1307 -0 63.1534 -0 66.35 -40.7461 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 20.9624 -0 36.2619 -0 46.149 -47.8133 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 44.2386 -0 43.2259 -0 36.3325 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 46.4999 -0 73.1124 -0 71.7382 -0 51.1943 -0 40.4831 -0 40.027 -0 37.2003 -0 41.2846 -0 56.5013 -0 59.2295 -0 36.9827 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 42.195 -0 41.7368 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -51.9099 24.4779 -67.7058 0 -47.3586 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 37.2506 -0 41.4862 -0 38.3608 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 17.496 -20.386 0 -0 31.0693 -0 33.5872 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 -0 0 diff --git a/my_norm_stretch.txt b/my_norm_stretch.txt deleted file mode 100644 index 6044516..0000000 --- a/my_norm_stretch.txt +++ /dev/null @@ -1,2 +0,0 @@ -0.99662 0.99701 0.997294 0.997653 0.99802 0.998375 0.99862 0.998823 0.999017 0.999229 0.999382 0.999483 0.999565 0.999664 0.999735 0.999771 0.999867 0.999952 0.999993 1 -0.995153 0.995759 0.996166 0.996636 0.997026 0.997296 0.997731 0.998193 0.998464 0.998711 0.998916 0.999111 0.99928 0.999454 0.99961 0.999755 0.999869 0.999987 1 0.999939 diff --git a/my_norm_weights.txt b/my_norm_weights.txt deleted file mode 100644 index c435d7e..0000000 --- a/my_norm_weights.txt +++ /dev/null @@ -1,2 +0,0 @@ -0.659151 0.575897 0.92144 0.753824 0.755212 0.755416 0.663912 1 0.339154 0.471354 0.604917 0.563227 0.409508 0.410427 0.381585 0.49465 0.344866 0.644495 0.302934 0.444998 -0.494304 0.411728 0.759217 0.625598 0.68613 0.84586 0.586421 1 0.350627 0.503822 0.721855 0.668908 0.461863 0.524179 0.495795 0.510191 0.467149 0.817569 0.387725 0.578398 From baf74e8ab04c391a32ccce8e5c8dd6f6b31679ba Mon Sep 17 00:00:00 2001 From: John Halloran Date: Wed, 11 Mar 2026 19:50:00 -0400 Subject: [PATCH 2/4] fix: link to correct CI script --- ...ix-and-codecov.yml => matrix-and-codecov-on-merge-to-main.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{matrix-and-codecov.yml => matrix-and-codecov-on-merge-to-main.yml} (100%) diff --git a/.github/workflows/matrix-and-codecov.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml similarity index 100% rename from .github/workflows/matrix-and-codecov.yml rename to .github/workflows/matrix-and-codecov-on-merge-to-main.yml From 82722a5aebe5e24413acda368f3c4d73c935999e Mon Sep 17 00:00:00 2001 From: John Halloran Date: Wed, 11 Mar 2026 19:57:01 -0400 Subject: [PATCH 3/4] chore: initial update to license --- LICENSE.rst | 2 +- docs/source/license.rst | 2 +- news/readme-fix.rst | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 news/readme-fix.rst diff --git a/LICENSE.rst b/LICENSE.rst index 43d13fc..e647442 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2026, The Trustees of Columbia University in the City of New York. +Copyright (c) 2026, diffpy.stretched-nmf contributors All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/source/license.rst b/docs/source/license.rst index 7428e28..abf0223 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -9,7 +9,7 @@ OPEN SOURCE LICENSE AGREEMENT ============================= BSD 3-Clause License -Copyright (c) 2026, The Trustees of Columbia University in the City of New York. +Copyright (c) 2026, diffpy.stretched-nmf contributors All Rights Reserved. Redistribution and use in source and binary forms, with or without diff --git a/news/readme-fix.rst b/news/readme-fix.rst new file mode 100644 index 0000000..42011fc --- /dev/null +++ b/news/readme-fix.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* Remove extraneous files + +**Security:** + +* From a014232ca3045f1948ee6d60212ade17d51c2a29 Mon Sep 17 00:00:00 2001 From: John Halloran Date: Wed, 11 Mar 2026 20:00:50 -0400 Subject: [PATCH 4/4] docs: match installation instructions between README and docs --- README.rst | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/README.rst b/README.rst index b030c64..701e860 100644 --- a/README.rst +++ b/README.rst @@ -58,40 +58,23 @@ If you use diffpy.stretched-nmf in a scientific publication, we would like you t Installation ------------ -The preferred method is to use `Miniconda Python -`_ -and install from the "conda-forge" channel of Conda packages. - -To add "conda-forge" to the conda channels, run the following in a terminal. :: +The preferred method is conda:: conda config --add channels conda-forge - -We want to install our packages in a suitable conda environment. -The following creates and activates a new environment named ``diffpy.stretched-nmf_env`` :: - conda create -n diffpy.stretched-nmf_env diffpy.stretched-nmf conda activate diffpy.stretched-nmf_env -The output should print the latest version displayed on the badges above. - -If the above does not work, you can use ``pip`` to download and install the latest release from -`Python Package Index `_. -To install using ``pip`` into your ``diffpy.stretched-nmf_env`` environment, type :: +Alternatively, install from PyPI with pip:: pip install diffpy.stretched-nmf -If you prefer to install from sources, after installing the dependencies, obtain the source archive from -`GitHub `_. Once installed, ``cd`` into your ``diffpy.stretched-nmf`` directory -and run the following :: +For source installs (after cloning the repo):: pip install . -This package also provides command-line utilities. To check the software has been installed correctly, type :: +Quick check:: diffpy.stretched-nmf --version - -You can also type the following command to verify the installation. :: - python -c "import diffpy.stretched_nmf; print(diffpy.stretched_nmf.__version__)"