From b2565589756d923ea7580c13d7185d9c7995a6da Mon Sep 17 00:00:00 2001 From: Matthew Newville Date: Mon, 18 Nov 2024 15:26:27 -0600 Subject: [PATCH] change license to MIT for consistency with other projects, update requirements --- LICENSE | 44 +++++++++++++++++--------------------------- setup.cfg | 6 +++--- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/LICENSE b/LICENSE index dccd9a753..f89b37c3c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,31 +1,21 @@ -BSD-2-CLAUSE LICENSE +The MIT License -Copyright, Licensing, and Re-distribution ------------------------------------------ +Copyright (c) 2010-2024 Matthew Newville, The University of Chicago -Unless otherwise stated, all files included here are copyrighted and -distributed under the following license: +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: -Copyright (c) 2010-2022 Matthew Newville, The University of Chicago -All rights reserved. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -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. - -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 HOLDER 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. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXP80RESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE qUSE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/setup.cfg b/setup.cfg index 64843a0aa..8f01d037f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,13 +7,13 @@ long_description_content_type = text/x-rst author = Matthew Newville and the xraylarch development team author_email = newville@cars.uchicago.edu url = https://xraypy.github.io//xraylarch -license = BSD 3-Clause +license = MIT License platforms = any classifiers = Development Status :: 5 - Production/Stable Intended Audience :: Science/Research Topic :: Scientific/Engineering - License :: OSI Approved :: BSD License + License :: OSI Approved :: MIT License Operating System :: OS Independent Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only @@ -40,7 +40,7 @@ install_requires = lmfit>=1.2.2 asteval>=1.0 uncertainties>=3.2.1 - pyshortcuts>=1.9.0 + pyshortcuts>=1.9.5 xraydb>=4.5 silx>=0.15.2 matplotlib>=3.5