From 960ae58e73242ecd715fa4077b75eaf0311bb8ce Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Sat, 7 Jan 2017 21:49:21 -0700 Subject: [PATCH 1/4] MIT License --- CONTRIBUTING.md | 3 ++ LICENSE | 79 +++++++++++++------------------------------------ 2 files changed, 23 insertions(+), 59 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 671c0bc48..416fbc801 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,6 +3,9 @@ PythonNet is developed and maintained by unpaid community members so well written, documented and tested pull requests are encouraged. +By submitting a pull request for this project, you agree to license your +contribution under the MIT license to this project. + ## Getting Started * Make sure you have a [GitHub account](https://github.com/signup/free) diff --git a/LICENSE b/LICENSE index 44e0648b3..865987060 100644 --- a/LICENSE +++ b/LICENSE @@ -1,59 +1,20 @@ -Zope Public License (ZPL) Version 2.0 ------------------------------------------------ - -This software is Copyright (c) Zope Corporation (tm) and -Contributors. All rights reserved. - -This license has been certified as open source. It has also -been designated as GPL compatible by the Free Software -Foundation (FSF). - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -1. Redistributions in source code must retain the above - copyright notice, this list of conditions, and the following - disclaimer. - -2. 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. - -3. The name Zope Corporation (tm) must not be used to - endorse or promote products derived from this software - without prior written permission from Zope Corporation. - -4. The right to distribute this software or to use it for - any purpose does not give you the right to use Servicemarks - (sm) or Trademarks (tm) of Zope Corporation. Use of them is - covered in a separate agreement (see - http://www.zope.com/Marks). - -5. If any files are modified, you must cause the modified - files to carry prominent notices stating that you changed - the files and the date of any change. - -Disclaimer - - THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' - AND ANY EXPRESSED 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 ZOPE CORPORATION OR ITS 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. - - -This software consists of contributions made by Zope -Corporation and many individuals on behalf of Zope -Corporation. Specific attributions are listed in the -accompanying credits file. +MIT License +Copyright (c) 2017 contributors of the `Python for .NET` project + +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: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +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 USE OR OTHER +DEALINGS IN THE SOFTWARE. From 5ed8fa4f76205f8b3e578dc810d91df0b8c4a0af Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Mon, 9 Jan 2017 09:05:46 +0100 Subject: [PATCH 2/4] Update LICENSE --- LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 865987060..0535829ff 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ MIT License -Copyright (c) 2017 contributors of the `Python for .NET` project + +Copyright (c) 2017 the contributors of the "Python for .NET" project Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), From fae6310f9a03a2c7391fb1f87a75d5a034f8c781 Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Mon, 9 Jan 2017 11:10:29 -0700 Subject: [PATCH 3/4] Update license in assembly and setup files --- setup.py | 2 +- src/console/assemblyinfo.cs | 2 +- src/runtime/assemblyinfo.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index c5b00049d..640195826 100644 --- a/setup.py +++ b/setup.py @@ -345,7 +345,7 @@ def _get_interop_filename(): 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: C#', - 'License :: OSI Approved :: Zope Public License', + 'License :: OSI Approved :: MIT License', 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'Operating System :: Microsoft :: Windows', diff --git a/src/console/assemblyinfo.cs b/src/console/assemblyinfo.cs index 51a280e7a..60825a2a2 100644 --- a/src/console/assemblyinfo.cs +++ b/src/console/assemblyinfo.cs @@ -13,6 +13,6 @@ [assembly: PermissionSetAttribute(SecurityAction.RequestMinimum, Name = "FullTrust")] [assembly: AssemblyDescriptionAttribute("")] -[assembly: AssemblyCopyrightAttribute("Zope Public License, Version 2.0 (ZPL)")] +[assembly: AssemblyCopyrightAttribute("MIT License")] [assembly: AssemblyFileVersionAttribute("2.0.0.4")] [assembly: NeutralResourcesLanguageAttribute("en")] \ No newline at end of file diff --git a/src/runtime/assemblyinfo.cs b/src/runtime/assemblyinfo.cs index 609ba342a..ef9f529b6 100644 --- a/src/runtime/assemblyinfo.cs +++ b/src/runtime/assemblyinfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyDefaultAliasAttribute("Python.Runtime.dll")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: AssemblyCopyrightAttribute("Zope Public License, Version 2.0 (ZPL)")] +[assembly: AssemblyCopyrightAttribute("MIT License")] [assembly: AssemblyFileVersionAttribute("2.0.0.2")] [assembly: NeutralResourcesLanguageAttribute("en")] From a906eb317a64c07decbfb5f7dbc37165cd95725a Mon Sep 17 00:00:00 2001 From: Victor Uriarte Date: Tue, 10 Jan 2017 14:52:34 -0700 Subject: [PATCH 4/4] Add AUTHORS.md --- AUTHORS.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 AUTHORS.md diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 000000000..2a2110f26 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,41 @@ +# Credits + +## Development Lead + +- Barton Cline ([@BartonCline](https://github.com/BartonCline)) +- Benedikt Reinartz ([@filmor](https://github.com/filmor)) +- Brian Lloyd ([@brianlloyd](https://github.com/brianlloyd)) +- David Anthoff ([@davidanthoff](https://github.com/davidanthoff)) +- Denis Akhiyarov ([@denfromufa](https://github.com/denfromufa)) +- Tony Roberts ([@tonyroberts](https://github.com/tonyroberts)) +- Victor Uriarte ([@vmuriart](https://github.com/vmuriart)) + +## Contributors + +- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich)) +- Christian Heimes ([@tiran](https://github.com/tiran)) +- Christoph Gohlke ([@cgohlke](https://github.com/cgohlke)) +- Daniel Santana ([@dgsantana](https://github.com/dgsantana)) +- David Lechner ([@dlech](https://github.com/dlech)) +- He-chien Tsai ([@t3476](https://github.com/t3476)) +- Jeff Reback ([@jreback](https://github.com/jreback)) +- Joe Frayne ([@jfrayne](https://github.com/jfrayne)) +- John Burnett ([@johnburnett](https://github.com/johnburnett)) +- Luke Stratman ([@lstratman](https://github.com/lstratman)) +- Matthias Dittrich ([@matthid](https://github.com/matthid)) +- Patrick Stewart ([@patstew](https://github.com/patstew)) +- Raphael Nestler ([@rnestler](https://github.com/rnestler)) +- Sam Winstanley ([@swinstanley](https://github.com/swinstanley)) +- Sean Freitag ([@cowboygneox](https://github.com/cowboygneox)) +- Serge Weinstock ([@sweinst](https://github.com/sweinst)) +- Virgil Dupras ([@hsoft](https://github.com/hsoft)) +- Xavier Dupré ([@sdpython](https://github.com/sdpython)) +- Zane Purvis ([@zanedp](https://github.com/zanedp)) +- ([@ArvidJB](https://github.com/ArvidJB)) +- ([@bltribble](https://github.com/bltribble)) +- ([@dmitriyse](https://github.com/dmitriyse)) +- ([@fdanny](https://github.com/fdanny)) +- ([@omnicognate](https://github.com/omnicognate)) +- ([@rico-chet](https://github.com/rico-chet)) +- ([@rmadsen-ks](https://github.com/rmadsen-ks)) +- ([@stonebig](https://github.com/stonebig))