Permalink
Browse files

Rebased to upstream master

  • Loading branch information...
2 parents b2e364a + e2a29a4 commit 8cda6326a4939e9cccb59388405a46d743401dcc @kdavies4 committed Oct 17, 2012
Showing 1,124 changed files with 158,980 additions and 90,131 deletions.
View
@@ -1,10 +1,12 @@
-# Editor temporary/working/backup files #
#########################################
+# Editor temporary/working/backup files #
.#*
[#]*#
*~
*$
*.bak
+.project
+.pydevproject
# Compiled source #
###################
@@ -27,6 +29,8 @@ doc/_build
dist
# Egg metadata
*.egg-info
+# tox testing tool
+.tox
# OS generated files #
######################
View
@@ -0,0 +1,17 @@
+language: python
+
+python:
+ - 2.6
+ - 2.7
+ - 3.1
+ - 3.2
+
+install:
+ - pip install --use-mirrors nose numpy
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
+ - python setup.py install
+
+script:
+ - mkdir ../foo
+ - cd ../foo
+ - python ../matplotlib/tests.py
View
@@ -1,9 +1,97 @@
+2012-10-05 Add support for saving animations as animated GIFs. - JVDP
+
+2012-08-11 Fix path-closing bug in patches.Polygon, so that regardless
+ of whether the path is the initial one or was subsequently
+ set by set_xy(), get_xy() will return a closed path if and
+ only if get_closed() is True. Thanks to Jacob Vanderplas. - EF
+
+2012-08-05 When a norm is passed to contourf, either or both of the
+ vmin, vmax attributes of that norm are now respected.
+ Formerly they were respected only if both were
+ specified. In addition, vmin and/or vmax can now
+ be passed to contourf directly as kwargs. - EF
+
+2012-07-24 Contourf handles the extend kwarg by mapping the extended
+ ranges outside the normed 0-1 range so that they are
+ handled by colormap colors determined by the set_under
+ and set_over methods. Previously the extended ranges
+ were mapped to 0 or 1 so that the "under" and "over"
+ colormap colors were ignored. This change also increases
+ slightly the color contrast for a given set of contour
+ levels. - EF
+
+2012-06-24 Make use of mathtext in tick labels configurable - DSD
+
+2012-06-05 Images loaded through PIL are now ordered correctly - CG
+
+2012-06-02 Add new Axes method and pyplot function, hist2d. - PO
+
+2012-05-31 Remove support for 'cairo.<format>' style of backend specification.
+ Deprecate 'cairo.format' and 'savefig.extension' rcParams and
+ replace with 'savefig.format'. - Martin Spacek
+
+2012-05-29 pcolormesh now obeys the passed in "edgecolor" kwarg.
+ To support this, the "shading" argument to pcolormesh now only
+ takes "flat" or "gouraud". To achieve the old "faceted" behavior,
+ pass "edgecolors='k'". - MGD
+
+2012-05-22 Added radius kwarg to pie charts. - HH
+
+2012-05-22 Collections now have a setting "offset_position" to select whether
+ the offsets are given in "screen" coordinates (default,
+ following the old behavior) or "data" coordinates. This is currently
+ used internally to improve the performance of hexbin.
+
+ As a result, the "draw_path_collection" backend methods have grown
+ a new argument "offset_position". - MGD
+
+2012-05-04 Add a new argument to pie charts - startingangle - that
+ allows one to specify the angle offset for the first wedge
+ of the chart. - EP
+
+2012-05-03 symlog scale now obeys the logarithmic base. Previously, it was
+ completely ignored and always treated as base e. - MGD
+
+2012-05-03 Allow linscalex/y keyword to symlog scale that allows the size of
+ the linear portion relative to the logarithmic portion to be
+ adjusted. - MGD
+
+2012-04-14 Added new plot style: stackplot. This new feature supports stacked
+ area plots. - Damon McDougall
+
+2012-04-06 When path clipping changes a LINETO to a MOVETO, it also
+ changes any CLOSEPOLY command to a LINETO to the initial
+ point. This fixes a problem with pdf and svg where the
+ CLOSEPOLY would then draw a line to the latest MOVETO
+ position instead of the intended initial position. - JKS
+
+2012-03-27 Add support to ImageGrid for placing colorbars only at
+ one edge of each column/row. - RMM
+
+2012-03-07 Refactor movie writing into useful classes that make use
+ of pipes to write image data to ffmpeg or mencoder. Also
+ improve settings for these and the ability to pass custom
+ options. - RMM
+
+2012-02-29 errorevery keyword added to errorbar to enable errorbar
+ subsampling. fixes issue #600.
+
+2012-02-28 Added plot_trisurf to the mplot3d toolkit. This supports plotting
+ three dimensional surfaces on an irregular grid. - Damon McDougall
+
+2012-01-23 The radius labels in polar plots no longer use a fixed
+ padding, but use a different alignment depending on the
+ quadrant they are in. This fixes numerical problems when
+ (rmax - rmin) gets too small. - MGD
+
+2012-01-08 Add axes.streamplot to plot streamlines of a velocity field.
+ Adapted from Tom Flannaghan streamplot implementation. -TSY
+
2011-12-29 ps and pdf markers are now stroked only if the line width
is nonzero for consistency with agg, fixes issue #621. - JKS
2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS
-
2011-10-25 added support for \operatorname to mathtext,
including the ability to insert spaces, such as
$\operatorname{arg\,max}$ - PI
View
@@ -413,7 +413,7 @@ namespace Py
{
}
- bool accepts( PyObject *pyob )
+ virtual bool accepts( PyObject *pyob ) const
{
return pyob == NULL;
}
@@ -1520,7 +1520,7 @@ namespace Py
int operator-( const iterator &other ) const
{
- if( seq.ptr() != other.seq.ptr() )
+ if( seq->ptr() != other.seq->ptr() )
throw RuntimeError( "SeqBase<T>::iterator comparison error" );
return count - other.count;
@@ -440,10 +440,10 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam
table->tp_version_tag = 0;
#ifdef COUNT_ALLOCS
- table->tp_alloc = 0;
- table->tp_free = 0;
+ table->tp_allocs = 0;
+ table->tp_frees = 0;
table->tp_maxalloc = 0;
- table->tp_orev = 0;
+ table->tp_prev = 0;
table->tp_next = 0;
#endif
}
View
60 INSTALL
@@ -6,21 +6,21 @@
Installing
**********
-There are many different ways to install matplotlib, and the best
-way depends on what operating system you are using, what you already
-have installed, and how you want to use it. To avoid wading through
-all the details (and potential complications) on this page, the
-easiest thing for you to do is use one of the pre-packaged python
+There are many different ways to install matplotlib, and the best way
+depends on what operating system you are using, what you already have
+installed, and how you want to use it. To avoid wading through all
+the details (and potential complications) on this page, the easiest
+thing for you to do is use one of the pre-packaged python
distributions that already provide matplotlib built-in. The Enthought
Python Distribution `(EPD)
<http://www.enthought.com/products/epd.php>`_ for Windows, OS X or
Redhat is an excellent choice that "just works" out of the box.
Another excellent alternative for Windows users is `Python (x, y)
-<http://www.pythonxy.com/foreword.php>`_ which tends to be updated a
-bit more frequently. Both of these packages include matplotlib and
-pylab, and *lots* of other useful tools. matplotlib is also packaged
-for almost every major Linux distribution. So if you are on Linux,
-your package manager will probably provide matplotlib prebuilt.
+<http://www.pythonxy.com/>`_ which tends to be updated a bit more
+frequently. Both of these packages include matplotlib and pylab, and
+*lots* of other useful tools. matplotlib is also packaged for almost
+every major Linux distribution. So if you are on Linux, your package
+manager will probably provide matplotlib prebuilt.
Manually installing pre-built packages
@@ -37,10 +37,9 @@ are available for download `here <http://www.python.org/download>`_,
but OS X users please read :ref:`which-python-for-osx`.
Once you have python up and running, you will need to install `numpy
-<http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`_.
-numpy provides high-performance array data structures and mathematical
-functions, and is a requirement for matplotlib. You can test your
-progress::
+<http://www.numpy.org/>`_. numpy provides high-performance array data
+structures and mathematical functions, and is a requirement for
+matplotlib. You can test your progress::
>>> import numpy
>>> print numpy.__version__
@@ -52,7 +51,7 @@ interactive shell for python that is matplotlib-aware.
Next, we need to get matplotlib installed. We provide prebuilt
binaries for OS X and Windows on the matplotlib `download
-<http://sourceforge.net/projects/matplotlib/files/>`_ page. Click on
+<https://github.com/matplotlib/matplotlib/downloads/>`_ page. Click on
the latest release of the "matplotlib" package, choose your python
version (2.6, 2.7 or 3.2) and your platform (macosx or win32). If you
have any problems, please check the :ref:`installing-faq`, search
@@ -119,13 +118,13 @@ subdirectory.
Installing from source
======================
-If you are interested in contributing to matplotlib
-development, running the latest source code, or just like to
-build everything yourself, it is not difficult to build matplotlib
-from source. Grab the latest *tar.gz* release file from `sourceforge
-<http://sourceforge.net/project/showfiles.php?group_id=80706>`_, or if
-you want to develop matplotlib or just need the latest bugfixed
-version, grab the latest git version :ref:`install-from-git`.
+If you are interested in contributing to matplotlib development,
+running the latest source code, or just like to build everything
+yourself, it is not difficult to build matplotlib from source. Grab
+the latest *tar.gz* release file from `the download page
+<https://github.com/matplotlib/matplotlib/downloads>`_, or if you want
+to develop matplotlib or just need the latest bugfixed version, grab
+the latest git version :ref:`install-from-git`.
Once you have satisfied the requirements detailed below (mainly
python, numpy, libpng and freetype), you can build matplotlib::
@@ -157,11 +156,12 @@ Build requirements
These are external packages which you will need to install before
installing matplotlib. Windows users only need the first two (python
and numpy) since the others are built into the matplotlib Windows
-installers available for download at the sourceforge site. If you are
+installers available for download at `the download page
+<https://github.com/matplotlib/matplotlib/downloads>_`. If you are
building on OSX, see :ref:`build_osx`. If you are installing
-dependencies with a package manager on Linux, you may need to install the
-development packages (look for a "-dev" postfix) in addition to the
-libraries themselves.
+dependencies with a package manager on Linux, you may need to install
+the development packages (look for a "-dev" postfix) in addition to
+the libraries themselves.
.. note::
@@ -179,12 +179,11 @@ libraries themselves.
This does not build matplotlib, but it does get the install the
build dependencies, which will make building from source easier.
-:term:`python` 2.6 (or later but not python3)
- matplotlib requires python 2.6 or later (`download <http://www.python.org/download/>`__)
+:term:`python` 2.6, 2.7, 3.1 or 3.2
+ `Download python <http://www.python.org/download/>`_.
:term:`numpy` |minimum_numpy_version| (or later)
- array support for python (`download
- <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
+ array support for python (`download <http://numpy.org>`_)
libpng 1.2 (or later)
library for loading and saving :term:`PNG` files (`download
@@ -254,4 +253,3 @@ can get the libpng and freetype requirements (darwinports, fink,
the different OSX version (e.g., 10.4 and 10.5). We recommend that you build
the way we do for the OSX release: get the source from the tarball or the
git repository and follow the instruction in :file:`README.osx`.
-
View
@@ -13,6 +13,7 @@ include lib/matplotlib/mpl-data/images/*
include lib/matplotlib/mpl-data/fonts/ttf/*
include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
include lib/matplotlib/mpl-data/fonts/afm/*
+recursive-include lib/matplotlib/mpl-data/sample_data/*
recursive-include license LICENSE*
recursive-include examples *
recursive-include doc *
View
@@ -1,46 +1,9 @@
-matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6
-
matplotlib is a python 2D plotting library which produces publication
quality figures in a variety of hardcopy formats and interactive
environments across platforms. matplotlib can be used in python
scripts, the python and ipython shell (ala matlab or mathematica), web
application servers, and various graphical user interface toolkits.
-Home page: <http://matplotlib.sourceforge.net/>
-
-Before running matplotlib, you must install numpy. Binary installers
-for all these packages are available here:
-
- <http://pythonmac.org/packages/py25-fat/index.html>.
-
-*** Back Ends ***
-
-You may use TkAgg or WXAgg back ends; Qt and GTK support is not
-provided in this package. By default this matplotlib uses TkAgg
-because Tcl/Tk is included with MacOS X.
-
-If you wish to use WXAgg then:
-* Install wxPython from:
- <http://pythonmac.org/packages/py25-fat/index.html>.
-* Configure a matplotlibrc file, as described below.
-
-For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x
-
-*** Configuring a matplotlibrc file ***
-
-If you wish to change any matplotlib settings, create a file:
- ~/.matplotlib/matplotlibrc
-
-
-that contains at least the following information. The values shown are
-the defaults in the internal matplotlibrc file; change them as you see
-fit:
-
-# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg
-# Agg Cairo GD GDK Paint PS PDF SVG Template
-backend : TkAgg
-interactive : False # see http://matplotlib.sourceforge.net/interactive.html
-
-See also
-<http://matplotlib.sourceforge.net/users/customizing.html>
+Home page: <http://matplotlib.org/>
+For installation instructions and requirements, see the INSTALL file.
View
File renamed without changes.
@@ -1365,7 +1365,7 @@ namespace agg
//---------------------------------------------------------------------
void profile(const line_profile_aa& prof) { m_profile = &prof; }
const line_profile_aa& profile() const { return *m_profile; }
- line_profile_aa& profile() { return *m_profile; }
+ const line_profile_aa& profile() { return *m_profile; }
//---------------------------------------------------------------------
int subpixel_width() const { return m_profile->subpixel_width(); }
Oops, something went wrong.

0 comments on commit 8cda632

Please sign in to comment.