diff --git a/LICENSE b/LICENCE similarity index 74% rename from LICENSE rename to LICENCE index af4c9fd6..b0b4be56 100644 --- a/LICENSE +++ b/LICENCE @@ -6,16 +6,22 @@ for their respective work, and release the work under the MIT licence Exceptions or notable authors are listed below in reverse chronological order: -* [CC-BY-SA-4.0] 2015-2016 Casper da Costa-Luis - [casperdcl](https://github.com/casperdcl) -* MIT 2016 [PR #96] Google Inc. +* MPLv2.0 (text below) 2015-2016 (c) Casper da Costa-Luis + [casperdcl](https://github.com/casperdcl). +* MIT 2016 (c) [PR #96] on behalf of Google Inc. - [CC-BY-SA-4.0]: http://creativecommons.org/licenses/by-sa/4.0/ [PR #96]: https://github.com/tqdm/tqdm/pull/96 -The MIT License (MIT) ---------------------- +Mozilla Public Licence (MPL) v. 2.0 - Exhibit A +----------------------------------------------- + +This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. + + +MIT License (MIT) +----------------- Copyright (c) 2013 noamraph diff --git a/README.rst b/README.rst index d0eb90e1..58b2618d 100644 --- a/README.rst +++ b/README.rst @@ -549,7 +549,7 @@ file for more information. License ------- -Mostly `CC, MIT licence `__. +Multiple licences, mostly `MPLv2.0, MIT licences `__. Authors diff --git a/tqdm/_version.py b/tqdm/_version.py index 393cac67..ea2327d8 100644 --- a/tqdm/_version.py +++ b/tqdm/_version.py @@ -1,5 +1,5 @@ # Definition of the version number -version_info = 4, 1, 0 # major, minor, patch, -extra +version_info = 4, 2, 0 # major, minor, patch, -extra # Nice string for the version __version__ = '.'.join(map(str, version_info)).replace('.-', '-').strip('.-')