diff --git a/.github/workflows/build-wheel-upload.yml b/.github/workflows/build-wheel-release-upload.yml similarity index 88% rename from .github/workflows/build-wheel-upload.yml rename to .github/workflows/build-wheel-release-upload.yml index 615b001..9763d03 100644 --- a/.github/workflows/build-wheel-upload.yml +++ b/.github/workflows/build-wheel-release-upload.yml @@ -7,13 +7,12 @@ on: - "*" # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml jobs: - release: + build-release: uses: scikit-package/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0 with: project: diffpy.srxplanar c_extension: false - maintainer_github_username: sbillinge - + maintainer_GITHUB_username: sbillinge secrets: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} PAT_TOKEN: ${{ secrets.PAT_TOKEN }} diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml new file mode 100644 index 0000000..2724204 --- /dev/null +++ b/.github/workflows/tests-on-pr.yml @@ -0,0 +1,16 @@ +name: Tests on PR + +on: + pull_request: + workflow_dispatch: + +jobs: + tests-on-pr: + uses: scikit-package/release-scripts/.github/workflows/_tests-on-pr.yml@v0 + with: + project: diffpy.srxplanar + c_extension: false + headless: false + python_version: "3.13" + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/AUTHORS.txt b/AUTHORS.txt deleted file mode 100644 index 4306273..0000000 --- a/AUTHORS.txt +++ /dev/null @@ -1 +0,0 @@ -Xiaohao Yang diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index f982e53..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,33 +0,0 @@ -This program is part of the DiffPy and DANSE open-source projects at Columbia -University and is available subject to the conditions and terms laid out below. - -Copyright © 2008-2011, Trustees of Columbia University in the City of New York, -all rights reserved. - -For more information please visit the diffpy web-page at http://diffpy.org or -email Prof. Simon Billinge at sb2896@columbia.edu. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the names of COLUMBIA UNIVERSITY, MICHIGAN STATE UNIVERSITY nor the - names of their contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE_tifffiles.txt b/LICENSE_tifffiles.txt deleted file mode 100644 index 7d06677..0000000 --- a/LICENSE_tifffiles.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 1994-2014, Christoph Gohlke -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -* Neither the name of the copyright holders nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff --git a/cookiecutter.json b/cookiecutter.json new file mode 100644 index 0000000..9c24d55 --- /dev/null +++ b/cookiecutter.json @@ -0,0 +1,18 @@ +{ + "maintainer_name": "Simon Billinge", + "maintainer_email": "sb2896@columbia.edu", + "maintainer_github_username": "sbillinge", + "contributors": "Simon Billinge, Billinge Group members", + "license_holders": "The Trustees of Columbia University in the City of New York", + "project_name": "diffpy.srxplanar", + "github_username_or_orgname": "diffpy", + "github_repo_name": "diffpy.srxplanar", + "conda_pypi_package_dist_name": "diffpy.srxplanar", + "package_dir_name": "diffpy.srxplanar", + "project_short_description": "Distance Printer, calculate the inter atomic distances. Part of xPDFsuite", + "project_keywords": "diffpy, pdf, data interpretation", + "minimum_supported_python_version": "3.12", + "maximum_supported_python_version": "3.14", + "project_needs_c_code_compiled": "No", + "project_has_gui_tests": "No" +} diff --git a/src/diffpy/confutils/__init__.py b/src/diffpy/confutils/__init__.py index 4917ea1..a3af0ba 100644 --- a/src/diffpy/confutils/__init__.py +++ b/src/diffpy/confutils/__init__.py @@ -3,7 +3,7 @@ # # diffpy.confutils by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/confutils/config.py b/src/diffpy/confutils/config.py index e13728a..faefc9a 100644 --- a/src/diffpy/confutils/config.py +++ b/src/diffpy/confutils/config.py @@ -3,7 +3,7 @@ # # diffpy.confutils by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2012 Trustees of the Columbia University +# (c) 2012-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/confutils/tools.py b/src/diffpy/confutils/tools.py index 5df9a7c..63277d6 100644 --- a/src/diffpy/confutils/tools.py +++ b/src/diffpy/confutils/tools.py @@ -3,7 +3,7 @@ # # diffpy.confutils by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2013 Trustees of the Columbia University +# (c) 2013-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/confutils/version.py b/src/diffpy/confutils/version.py index baedec1..be10460 100644 --- a/src/diffpy/confutils/version.py +++ b/src/diffpy/confutils/version.py @@ -3,7 +3,7 @@ # # diffpy.confutils by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2013 Trustees of the Columbia University +# (c) 2013-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/srxplanar/calculate.py b/src/diffpy/srxplanar/calculate.py index 41bde8a..05469e9 100644 --- a/src/diffpy/srxplanar/calculate.py +++ b/src/diffpy/srxplanar/calculate.py @@ -3,7 +3,7 @@ # # diffpy.srxplanar by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/srxplanar/loadimage.py b/src/diffpy/srxplanar/loadimage.py index d7ca571..b30e97e 100644 --- a/src/diffpy/srxplanar/loadimage.py +++ b/src/diffpy/srxplanar/loadimage.py @@ -3,7 +3,7 @@ # # diffpy.srxplanar by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/srxplanar/mask.py b/src/diffpy/srxplanar/mask.py index 7cc5025..e4aa188 100644 --- a/src/diffpy/srxplanar/mask.py +++ b/src/diffpy/srxplanar/mask.py @@ -3,7 +3,7 @@ # # diffpy.srxplanar by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/srxplanar/saveresults.py b/src/diffpy/srxplanar/saveresults.py index 9e74818..6d3bdbe 100644 --- a/src/diffpy/srxplanar/saveresults.py +++ b/src/diffpy/srxplanar/saveresults.py @@ -3,7 +3,7 @@ # # diffpy.srxplanar by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/srxplanar/srxplanar.py b/src/diffpy/srxplanar/srxplanar.py index 8e6971e..d4c025d 100644 --- a/src/diffpy/srxplanar/srxplanar.py +++ b/src/diffpy/srxplanar/srxplanar.py @@ -3,7 +3,7 @@ # # diffpy.srxplanar by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang diff --git a/src/diffpy/srxplanar/srxplanarconfig.py b/src/diffpy/srxplanar/srxplanarconfig.py index 400ff17..14dbcef 100644 --- a/src/diffpy/srxplanar/srxplanarconfig.py +++ b/src/diffpy/srxplanar/srxplanarconfig.py @@ -3,7 +3,7 @@ # # diffpy.srxplanar by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2010 Trustees of the Columbia University +# (c) 2010-2025 Trustees of the Columbia University # in the City of New York. All rights reserved. # # File coded by: Xiaohao Yang