bump version, Merge branch 'licencizors'

This commit is contained in:
Casper da Costa-Luis 2016-02-29 23:29:44 +00:00
commit ea7ef30c8a
3 changed files with 14 additions and 8 deletions

View File

@ -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

View File

@ -549,7 +549,7 @@ file for more information.
License
-------
Mostly `CC, MIT licence <https://raw.githubusercontent.com/tqdm/tqdm/master/LICENSE>`__.
Multiple licences, mostly `MPLv2.0, MIT licences <https://raw.githubusercontent.com/tqdm/tqdm/master/LICENCE>`__.
Authors

View File

@ -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('.-')