Skip to content

Commit 78ed37c

Browse files
committed
bumb version string; change python 2.4 to 2.6 dependency
1 parent 8c0251e commit 78ed37c

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

INSTALL

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Next, we need to get matplotlib installed. We provide prebuilt
5454
binaries for OS X and Windows on the matplotlib `download
5555
<http://sourceforge.net/projects/matplotlib/files/>`_ page. Click on
5656
the latest release of the "matplotlib" package, choose your python
57-
version (e.g., 2.5, 2.6 or 2.7) and your platform (macosx or win32).
57+
version (e.g., 2.6 or 2.7) and your platform (macosx or win32).
5858
If you have any problems, please check the :ref:`installing-faq`,
5959
search using Google, and/or post a question to the `mailing list
6060
<http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
@@ -179,8 +179,8 @@ libraries themselves.
179179
This does not build matplotlib, but it does get the install the
180180
build dependencies, which will make building from source easier.
181181

182-
:term:`python` 2.4 (or later but not python3)
183-
matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
182+
:term:`python` 2.6 (or later but not python3)
183+
matplotlib requires python 2.6 or later (`download <http://www.python.org/download/>`__)
184184

185185
:term:`numpy` 1.1 (or later)
186186
array support for python (`download

doc/devel/coding_guide.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ in mind.
1717
and consider posting to `matplotlib-devel
1818
<http://lists.sourceforge.net/mailman/listinfo/matplotlib-devel>`_
1919

20-
* Are your changes python2.4 compatible? We still support 2.4, so
21-
avoid features new to 2.5
20+
* Are your changes python2.6 compatible? We support python2.6 and later
2221

2322
* Can you pass :file:`examples/tests/backend_driver.py`? This is our
2423
poor man's unit test.

doc/users/whats_new.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This page just covers the highlights -- for the full story, see the
99

1010
.. note::
1111
Matplotlib version 1.1 is the last major release compatible with Python
12-
versions 2.4 to 2.7. The next major release will support
12+
versions 2.4 to 2.7. matplotlib 1.2 and later require
1313
versions 2.6, 2.7, and 3.1 and higher.
1414

1515
.. _whats-new-1-1:

lib/matplotlib/__init__.py

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

102-
__version__ = '1.1.x'
102+
__version__ = '1.2.x'
103103

104104
import os, re, shutil, subprocess, sys, warnings
105105
import distutils.sysconfig

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import sys
2929
major, minor1, minor2, s, tmp = sys.version_info
3030

31-
if major==2 and minor1<4 or major<2:
32-
raise SystemExit("""matplotlib requires Python 2.4 or later.""")
31+
if major==2 and minor1<6 or major<2:
32+
raise SystemExit("""matplotlib requires Python 2.6 or later.""")
3333

3434
import glob
3535
from distutils.core import setup

0 commit comments

Comments
 (0)