staying with MIT License, for now.
This commit is contained in:
parent
6c1fa87138
commit
4c0a20a7b9
24
LICENSE
24
LICENSE
|
@ -1,13 +1,19 @@
|
||||||
Copyright 2011 Kenneth Reitz
|
Copyright 2011 Kenneth Reitz
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
you may not use this file except in compliance with the License.
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
You may obtain a copy of the License at
|
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:
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
See the License for the specific language governing permissions and
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
limitations under the License.
|
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.
|
|
@ -22,7 +22,7 @@ Release v\ |version|. (:ref:`Installation <install>`)
|
||||||
.. * :ref:`search`
|
.. * :ref:`search`
|
||||||
|
|
||||||
|
|
||||||
Tablib is an :ref:`Apache Licensed <apache>` format-agnostic tabular dataset library, written in Python. It allows you to import, export, and manipulate tabular data sets. Advanced features include, segregation, dynamic columns, tags & filtering, and seamless format import & export.
|
Tablib is an :ref:`MIT Licensed <mit>` format-agnostic tabular dataset library, written in Python. It allows you to import, export, and manipulate tabular data sets. Advanced features include, segregation, dynamic columns, tags & filtering, and seamless format import & export.
|
||||||
|
|
||||||
::
|
::
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,10 @@ Tablib was developed with a few :pep:`20` idioms in mind.
|
||||||
|
|
||||||
All contributions to Tablib should keep these important rules in mind.
|
All contributions to Tablib should keep these important rules in mind.
|
||||||
|
|
||||||
.. _apache:
|
.. mit:
|
||||||
|
|
||||||
Apache License v2
|
MIT License
|
||||||
-----------------
|
-----------
|
||||||
|
|
||||||
A large number of open source projects you find today are `GPL Licensed`_.
|
A large number of open source projects you find today are `GPL Licensed`_.
|
||||||
While the GPL has its time and place, it should most certainly not be your
|
While the GPL has its time and place, it should most certainly not be your
|
||||||
|
@ -38,10 +38,10 @@ without the product itself also being offered as open source. The MIT, BSD, and
|
||||||
ISC licenses are great alternatives to the GPL that allow your open-source
|
ISC licenses are great alternatives to the GPL that allow your open-source
|
||||||
software to be used in proprietary, closed-source software.
|
software to be used in proprietary, closed-source software.
|
||||||
|
|
||||||
Tablib is released under terms of `The Apache License v2`_.
|
Tablib is released under terms of `The MIT License`_.
|
||||||
|
|
||||||
.. _`GPL Licensed`: http://www.opensource.org/licenses/gpl-license.php
|
.. _`GPL Licensed`: http://www.opensource.org/licenses/gpl-license.php
|
||||||
.. _`The Apache License v2`: http://opensource.org/licenses/Apache-2.0
|
.. _`The MIT License`: http://www.opensource.org/licenses/mit-license.php
|
||||||
|
|
||||||
|
|
||||||
.. _license:
|
.. _license:
|
||||||
|
@ -51,17 +51,23 @@ Tablib License
|
||||||
|
|
||||||
Copyright 2011 Kenneth Reitz
|
Copyright 2011 Kenneth Reitz
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
you may not use this file except in compliance with the License.
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
You may obtain a copy of the License at
|
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:
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
See the License for the specific language governing permissions and
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
limitations under the License.
|
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.
|
||||||
|
|
||||||
|
|
||||||
.. _pythonsupport:
|
.. _pythonsupport:
|
||||||
|
|
Loading…
Reference in New Issue