Skip to content

Commit e5b6317

Browse files
committed
Update version numbers
1 parent dd3d68e commit e5b6317

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

LICENSE/LICENSE

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 1.1.0
1+
LICENSE AGREEMENT FOR MATPLOTLIB 1.2.0
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
99
2. Subject to the terms and conditions of this License Agreement, JDH
1010
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
1111
to reproduce, analyze, test, perform and/or display publicly, prepare
12-
derivative works, distribute, and otherwise use matplotlib 1.1.0
12+
derivative works, distribute, and otherwise use matplotlib 1.2.0
1313
alone or in any derivative version, provided, however, that JDH's
1414
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
1515
2002-2011 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 1.1.0 alone or in any derivative version prepared by
16+
matplotlib 1.2.0 alone or in any derivative version prepared by
1717
Licensee.
1818

1919
3. In the event Licensee prepares a derivative work that is based on or
20-
incorporates matplotlib 1.1.0 or any part thereof, and wants to
20+
incorporates matplotlib 1.2.0 or any part thereof, and wants to
2121
make the derivative work available to others as provided herein, then
2222
Licensee hereby agrees to include in any such work a brief summary of
23-
the changes made to matplotlib 1.1.0.
23+
the changes made to matplotlib 1.2.0.
2424

25-
4. JDH is making matplotlib 1.1.0 available to Licensee on an "AS
25+
4. JDH is making matplotlib 1.2.0 available to Licensee on an "AS
2626
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
2727
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
2828
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.1.0
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.2.0
3030
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
3131

3232
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
33-
1.1.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
33+
1.2.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
3434
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 1.1.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
35+
MATPLOTLIB 1.2.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
3636
THE POSSIBILITY THEREOF.
3737

3838
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
4444
trademarks or trade name in a trademark sense to endorse or promote
4545
products or services of Licensee, or any third party.
4646

47-
8. By copying, installing or otherwise using matplotlib 1.1.0,
47+
8. By copying, installing or otherwise using matplotlib 1.2.0,
4848
Licensee agrees to be bound by the terms and conditions of this License
4949
Agreement.

lib/matplotlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"""
100100
from __future__ import print_function
101101

102-
__version__ = '1.2.0rc2'
102+
__version__ = '1.2.0rc3'
103103
__version__numpy__ = '1.4' # minimum required numpy version
104104

105105
import os, re, shutil, subprocess, sys, warnings

0 commit comments

Comments
 (0)