Skip to content

Commit

Permalink
change license to MIT for consistency with other projects, update req…
Browse files Browse the repository at this point in the history
…uirements
  • Loading branch information
newville committed Nov 18, 2024
1 parent bd58960 commit b256558
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 30 deletions.
44 changes: 17 additions & 27 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ long_description_content_type = text/x-rst
author = Matthew Newville and the xraylarch development team
author_email = [email protected]
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
Expand All @@ -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
Expand Down

0 comments on commit b256558

Please sign in to comment.