Merge remote branch 'remotes/main/master' (matplotlib/matplotlib/master)

Conflicts:
        doc/pyplots/make.py
        examples/animation/simple_3danim.py
        examples/pylab_examples/scatter_star_poly.py
        lib/matplotlib/backends/qt4_editor/formlayout.py
        lib/mpl_toolkits/axes_grid1/parasite_axes.py
        src/_backend_agg.cpp

Author: mdboom

CHANGELOG

@@ -1,3 +1,16 @@
+2011-03-10 Update pytz version to 2011c, thanks to Simon Cross. - JKS
+
+2011-03-06 Add standalone tests.py test runner script. - JKS
+
+2011-03-06 Set edgecolor to 'face' for scatter asterisk-type
+           symbols; this fixes a bug in which these symbols were
+           not responding to the c kwarg.  The symbols have no
+           face area, so only the edgecolor is visible. - EF
+
+2011-02-27 Support libpng version 1.5.x; suggestion by Michael
+           Albert. Changed installation specification to a
+           minimum of libpng version 1.2.  - EF
+
 2011-02-20 clabel accepts a callable as an fmt kwarg; modified
            patch by Daniel Hyams. - EF
 

CXX/Python3/Config.hxx

@@ -107,4 +107,12 @@
 #    define TEMPLATE_TYPENAME class
 #endif
 
+
+/* Need to fudge Py_hash_t types for python > 3.2 */
+
+#if PY_VERSION_HEX < 0x030200A4
+typedef long Py_hash_t;
+typedef unsigned long Py_uhash_t;
+#endif
+
 #endif //  __PyCXX_config_hh__

CXX/Python3/ExtensionTypeBase.hxx

@@ -83,7 +83,7 @@ namespace Py
         virtual Object rich_compare( const Object &, int );
         virtual Object repr();
         virtual Object str();
-        virtual long hash();
+        virtual Py_hash_t hash();
         virtual Object call( const Object &, const Object & );
         virtual Object iter();
         virtual PyObject *iternext();

CXX/Python3/Objects.hxx

@@ -276,7 +276,7 @@ namespace Py
             return Object( PyObject_GetItem( p, *key ), true );
         }
 
-        long hashValue() const
+        Py_hash_t hashValue() const
         {
             return PyObject_Hash( p );
         }
@@ -1165,7 +1165,7 @@ namespace Py
             return the_item.getItem( key );
         }
 
-        long hashValue() const
+        Py_hash_t hashValue() const
         {
             return the_item.hashValue();
         }
@@ -2545,7 +2545,7 @@ namespace Py
             return the_item.getItem( k );
         }
 
-        long hashValue() const
+        Py_hash_t hashValue() const
         {
             return the_item.hashValue();
         }

CXX/Python3/cxx_extensions.cxx

@@ -225,7 +225,7 @@ extern "C"
     static PyObject *rich_compare_handler( PyObject *, PyObject *, int );
     static PyObject *repr_handler( PyObject * );
     static PyObject *str_handler( PyObject * );
-    static long hash_handler( PyObject * );
+    static Py_hash_t hash_handler( PyObject * );
     static PyObject *call_handler( PyObject *, PyObject *, PyObject * );
     static PyObject *iter_handler( PyObject * );
     static PyObject *iternext_handler( PyObject * );
@@ -714,7 +714,7 @@ extern "C" PyObject *str_handler( PyObject *self )
     }
 }
 
-extern "C" long hash_handler( PyObject *self )
+extern "C" Py_hash_t hash_handler( PyObject *self )
 {
     try
     {
@@ -1267,7 +1267,7 @@ Py::Object PythonExtensionBase::str()
     return Py::None();
 }
 
-long PythonExtensionBase::hash()
+Py_hash_t PythonExtensionBase::hash()
 {
     missing_method( hash );
     return -1; }

doc/api/gridspec_api.rst

@@ -4,7 +4,7 @@ matplotlib gridspec
 
 
 :mod:`matplotlib.gridspec`
-====================
+==========================
 
 .. automodule:: matplotlib.gridspec
    :members:

doc/devel/coding_guide.rst

@@ -5,7 +5,7 @@ Coding guide
 ************
 
 Committing changes
-------------------
+==================
 
 When committing changes to matplotlib, there are a few things to bear
 in mind.
@@ -358,7 +358,6 @@ object::
     print 'datafile', datafile
 
 
-.. _license-discussion:
 
 
 
@@ -376,17 +375,31 @@ please ignore it while we consolidate our testing to these locations.)
 Running the tests
 -----------------
 
-Running the tests is simple. Make sure you have nose installed and
-type from within Python::
+Running the tests is simple. Make sure you have nose installed and run
+the script :file:`tests.py` in the root directory of the distribution.
+The script can take any of the usual `nosetest arguments`_, such as
+
+===================  ===========
+``-v``               increase verbosity
+``-d``               detailed error messages
+``--with-coverage``  enable collecting coverage information
+===================  ===========
+
+To run a single test from the command line, you can provide a
+dot-separated path to the module followed by the function separated by
+a colon, eg.  (this is assuming the test is installed)::
+
+  python tests.py matplotlib.tests.test_simplification:test_clipping
+
+An alternative implementation that does not look at command line
+arguments works from within Python::
 
   import matplotlib
   matplotlib.test()
 
-To run a single test from the command line, you can provide
-a dot-separated path to the module and function, eg.
-(this is assuming the test is installed)::
 
-  nosetests matplotlib.tests.test_simplification:test_clipping
+.. _`nosetest arguments`: http://somethingaboutorange.com/mrl/projects/nose/1.0.0/usage.html
+
 
 
 Writing a simple test
@@ -482,6 +495,8 @@ Let's say you've added a new module named
 the list of default tests, append its name to ``default_test_modules``
 in :file:`lib/matplotlib/__init__.py`.
 
+.. _license-discussion:
+
 Licenses
 ========
 

doc/devel/release_guide.rst

@@ -92,10 +92,7 @@ replacing 'jdh2358' with your sourceforge login.
 
 
 Any changes to fix bugs in the release candidate should be fixed in
-the release branch and merged into the trunk with `git merge`; see
-:ref:`git merge`.  When the release candidate is signed off on, build
-the final sdist, binaries and eggs, and upload them to the sourceforge
-release area.
+the release branch and merged into the trunk.
 
 
 .. _release-uploading:

doc/faq/howto_faq.rst

@@ -525,45 +525,7 @@ Contributing: howto
 Submit a patch
 -----------------
 
-If you have a github account, or are willing to make one, make a private fork
-of the repository at `<https://github.com/matplotlib/matplotlib.git>`_. Then
-clone the repository::
-
-   git clone git@github.com:your_github_id/matplotlib.git
-
-if you don't have a github account::
-
-   git clone git://github.com/matplotlib/matplotlib.git
-
-If your changes are relative to a release branch, change branches, for example::
-
-   git checkout v1.0.x
-
-Then make a new branch::
-
-   cd matplotlib
-   git checkout -b topic
-
-Make your changes, making commits as you see fit. To submit the changes, if you
-don't have a github account::
-
-   git diff topic v1.0.x > topic.diff
-
-Post your patch the :file:`topic.diff` to the  `matplotlib-devel
-<http://sourceforge.net/mail/?group_id=80706>`_ mailing list.
-
-If you do have a github account, push the topic branch to your fork::
-
-   git push origin topic
-
-Then visit your profile at github, select the new branch, and file a pull
-request.
-
-If you don't want to create a github account::
-
-   git clone git://github.com/matplotlib/matplotlib.git
-   cd matplotlib
-   git checkout
+See :ref:`making-patches` for information on how to make a patch with git.
 
 If you are posting a patch to fix a code bug, please explain your
 patch in words -- what was broken before and how you fixed it.  Also,

doc/faq/installing_faq.rst

@@ -92,7 +92,7 @@ install directory.  To cleanly rebuild:
    <locating-matplotlib-install>`
 
 
-.. _install-git:
+.. _install-from-git:
 
 Install from git
 ================
@@ -405,9 +405,11 @@ changing the occurrences of ``MacOSX10.4u.sdk`` into ``MacOSX10.5.sdk``
 ``/Library/Frameworks/Python.framework/Versions/Current/lib/pythonX.Y/site-packages/easy-install.pth``,
 (where X.Y is the version of Python you are building against)
 Comment out the line containing the name of the directory in which the
-previous version of MPL was installed (Looks something like ``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
+previous version of MPL was installed (Looks something like
+``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
 
-3. Save the following as a shell script , for example ``./install-matplotlib-epd-osx.sh`` ::
+3. Save the following as a shell script , for example
+``./install-matplotlib-epd-osx.sh``::
 
    NAME=matplotlib
    VERSION=v1.0.x