Skip to content

Commit 7fb099d

Browse files
rmorshearmorshea
committed
2 parents 613b103 + 08acc8d commit 7fb099d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1179
-659
lines changed

‎INSTALL

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ you will also need to install compatible versions of
6666
`pyparsing <https://pypi.python.org/pypi/pyparsing/>`_, and
6767
`cycler <https://pypi.python.org/pypi/Cycler>`_
6868
in addition to
69-
`matplotlib <http://matplotlib.org/downloads.html>`_.
69+
`matplotlib <http://pypi.python.org/pypi/matplotlib/>`_.
7070

7171
For Python 3.5 the `Visual C++ Redistributable for Visual Studio 2015
7272
<http://www.microsoft.com/en-us/download/details.aspx?id=48145>`_
7373
needs to be installed.
74-
In case Python 2.6 to 3.4 are not installed for all users (not the default),
74+
In case Python 2.6 to 3.4 are not installed for all users (not the default),
7575
the Microsoft Visual C++ 2008 (
7676
`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`__
7777
or
@@ -109,19 +109,18 @@ standard Python shell or IPython. It is enabled as the default backend
109109
for the official binaries. GTK3 is not supported on Windows.
110110

111111
The Windows installers (:file:`*.exe`) and wheels (:file:`*.whl`) on
112-
the `download page <http://matplotlib.org/downloads.html>`_ do not
113-
contain test data or example code.
114-
If you want to try the many demos that come in the matplotlib source
115-
distribution, download the :file:`*.tar.gz` file and look in the
116-
:file:`examples` subdirectory.
112+
the `PyPI download page <http://pypi.python.org/pypi/matplotlib/>`_ do
113+
not contain test data or example code. If you want to try the many
114+
demos that come in the matplotlib source distribution, download the
115+
:file:`*.tar.gz` file and look in the :file:`examples` subdirectory.
117116
To run the test suite, copy the :file:`lib\matplotlib\tests` and
118-
:file:`lib\mpl_toolkits\tests` directories from the source distribution to
119-
:file:`sys.prefix\Lib\site-packages\matplotlib` and
120-
:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and install
121-
`nose <https://pypi.python.org/pypi/nose>`_,
122-
`mock <https://pypi.python.org/pypi/mock>`_,
123-
Pillow, MiKTeX, GhostScript, ffmpeg, avconv, mencoder, ImageMagick, and
124-
`Inkscape <http://inkscape.org/>`_.
117+
:file:`lib\mpl_toolkits\tests` directories from the source
118+
distribution to :file:`sys.prefix\Lib\site-packages\matplotlib` and
119+
:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and
120+
install `nose <https://pypi.python.org/pypi/nose>`_, `mock
121+
<https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
122+
ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape
123+
<http://inkscape.org/>`_.
125124

126125

127126

@@ -133,10 +132,10 @@ Installing from source
133132
If you are interested in contributing to matplotlib development,
134133
running the latest source code, or just like to build everything
135134
yourself, it is not difficult to build matplotlib from source. Grab
136-
the latest *tar.gz* release file from `the download page
137-
<http://matplotlib.org/downloads.html>`_, or if you want
138-
to develop matplotlib or just need the latest bugfixed version, grab
139-
the latest git version :ref:`install-from-git`.
135+
the latest *tar.gz* release file from `the PyPI files page
136+
<https://pypi.python.org/pypi/matplotlib/>`_, or if you want to
137+
develop matplotlib or just need the latest bugfixed version, grab the
138+
latest git version :ref:`install-from-git`.
140139

141140
The standard environment variables `CC`, `CXX`, `PKG_CONFIG` are respected.
142141
This means you can set them if your toolchain is prefixed. This may be used for

‎README.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,14 @@ Or from the python interpreter::
2929

3030
Consider reading http://matplotlib.org/devel/coding_guide.html#testing for
3131
more information.
32+
33+
Contact
34+
=======
35+
matplotlib's communication channels include active mailing lists:
36+
37+
* `Users <https://mail.python.org/mailman/listinfo/matplotlib-users>`_ mailing list: matplotlib-users@python.org
38+
* `Announcement <https://mail.python.org/mailman/listinfo/matplotlib-announce>`_ mailing list: matplotlib-announce@python.org
39+
* `Development <https://mail.python.org/mailman/listinfo/matplotlib-devel>`_ mailing list: matplotlib-devel@python.org
40+
41+
42+
The first is a good starting point for general questions and discussions.

‎doc/.DS_Store

-10 KB
Binary file not shown.

‎doc/_templates/index.html

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ <h1>John Hunter (1968-2012)</h1>
9696
</table>
9797
</div>
9898

99-
<h1>Download</h1>
99+
<h1>Installation</h1>
100100

101101
Visit the
102-
<a href="http://matplotlib.org/downloads.html">matplotlib downloads
103-
page</a>.
102+
<a href="http://matplotlib.org/users/installing.html">matplotlib
103+
installation instructions.</a>.
104104

105105
<h1>Documentation</h1>
106106

@@ -131,8 +131,8 @@ <h4>Need help?</h4>
131131
the <a href="{{ pathto('api/index') }}">api</a> docs,
132132
<a href="http://matplotlib.1069221.n5.nabble.com/matplotlib-users-f3.html">mailing
133133
list archives</a>, and join the matplotlib
134-
mailing lists <a href="https://mail.python.org/mailman/listinfo/matplotlib-users">Users</a>,
135-
<a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">Announce</a> and
134+
mailing lists <a href="https://mail.python.org/mailman/listinfo/matplotlib-users">Users</a>,
135+
<a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">Announce</a> and
136136
<a href="https://mail.python.org/mailman/listinfo/matplotlib-devel">Devel</a>.
137137
Check out the matplotlib questions
138138
on <a href="http://stackoverflow.com/questions/tagged/matplotlib">stackoverflow</a>.
@@ -178,10 +178,13 @@ <h1>Citing matplotlib</h1>
178178
<h1>Open source</h1>
179179

180180
<p>
181-
Please consider <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donating</a>
182-
to support matplotlib development or to the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial Fund</a>.
181+
Please
182+
consider <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9T4KLZT2794S">donating
183+
to the matplotlib project</a> through the Numfocus organization or to
184+
the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
185+
Fund</a>.
183186
</p>
184-
187+
x
185188
<p>
186189
The matplotlib <a href="{{ pathto('users/license') }}">license</a> is based on the Python Software Foundation
187190
<a href="http://www.python.org/psf/license">(PSF)</a> license.

‎doc/devel/release_guide.rst

Lines changed: 3 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -90,84 +90,13 @@ Packaging
9090
:file:`release/win32` which you can use this to prepare the windows
9191
releases.
9292

93-
Posting files
94-
=============
95-
96-
Our current method is for the release manager to collect all of the
97-
binaries from the platform builders and post the files online on
98-
Sourceforge. It is also possible that those building the binaries
99-
could upload to directly to Sourceforge. We also post a source
100-
tarball to PyPI, since ``pip`` no longer trusts files downloaded from
101-
other sites.
102-
103-
There are many ways to upload files to Sourceforge (`scp`, `rsync`,
104-
`sftp`, and a web interface) described in `Sourceforge Release File
105-
System documentation
106-
<https://sourceforge.net/apps/trac/sourceforge/wiki/Release%20files%20for%20download>`_.
107-
Below, we will use `sftp`.
108-
109-
1. Create a directory containing all of the release files and `cd` to it.
110-
111-
2. `sftp` to Sourceforge::
112-
113-
sftp USERNAME@frs.sourceforge.net:/home/frs/project/matplotlib/matplotlib
114-
115-
3. Make a new directory for the release and move to it::
116-
117-
mkdir matplotlib-1.1.0rc1
118-
cd matplotlib-1.1.0rc1
119-
120-
4. Upload all of the files in the current directory on your local machine::
121-
122-
put *
123-
124-
If this release is a final release, the default download for the
125-
matplotlib project should also be updated. Login to Sourceforge and
126-
visit the `matplotlib files page
127-
<https://sourceforge.net/projects/matplotlib/files/matplotlib/>`_.
128-
Navigate to the tarball of the release you just updated, click on
129-
"Details" icon (it looks like a lower case ``i``), and make it the
130-
default download for all platforms.
131-
132-
There is a list of direct links to downloads on matplotlib's main
133-
website. This needs to be manually generated and updated every time
134-
new files are posted.
135-
136-
1. Clone the matplotlib documentation repository and `cd` into it::
137-
138-
git clone git@github.com:matplotlib/matplotlib.github.com.git
139-
cd matplotlib.github.com
140-
141-
2. Update the list of downloads that you want to display by editing
142-
the `downloads.txt` file. Generally, this should contain the last two
143-
final releases and any active release candidates.
144-
145-
3. Update the downloads webpage by running the `update_downloads.py`
146-
script. This script requires `paramiko` (for `sftp` support) and
147-
`jinja2` for templating. Both of these dependencies can be
148-
installed using pip::
149-
150-
pip install paramiko
151-
pip install jinja2
152-
153-
Then update the download page::
154-
155-
./update_downloads.py
156-
157-
You will be prompted for your Sourceforge username and password.
158-
159-
4. Commit the changes and push them up to github::
160-
161-
git commit -m "Updating download list"
162-
git push
16393

16494
Update PyPI
16595
===========
16696

167-
Once the tarball has been posted on Sourceforge, you can register a
168-
link to the new release on PyPI. This should only be done with final
169-
(non-release-candidate) releases, since doing so will hide any
170-
available stable releases.
97+
This step tells PyPI about the release and uploads a source
98+
tarball. This should only be done with final (non-release-candidate)
99+
releases, since doing so will hide any available stable releases.
171100

172101
You may need to set up your `.pypirc` file as described in the
173102
`distutils register command documentation

‎doc/faq/howto_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ in these environments. Most importantly, you need to decide what
597597
kinds of images you want to generate (PNG, PDF, SVG) and configure the
598598
appropriate default backend. For 99% of users, this will be the Agg
599599
backend, which uses the C++
600-
`antigrain <http://agg.sourceforge.net/antigrain.com/index.html>`_
600+
`antigrain <http://antigrain.com>`_
601601
rendering engine to make nice PNGs. The Agg backend is also
602602
configured to recognize requests to generate other output formats
603603
(PDF, PS, EPS, SVG). The easiest way to configure matplotlib to use

‎doc/faq/installing_faq.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ Standalone binary installers for Windows
390390

391391
If you have already installed Python and numpy, you can use one of the
392392
matplotlib binary installers for windows -- you can get these from the
393-
`download <http://matplotlib.org/downloads.html>`_ site. Chose the files with
394-
an ``.exe`` extension that match your version of Python (e.g., ``py2.7`` if you
395-
installed Python 2.7). If you haven't already installed Python, you can get
396-
the official version from the `Python web site
397-
<http://python.org/download/>`_.
393+
`the PyPI matplotlib page <http://pypi.python.org/pypi/matplotlib>`_
394+
site. Choose the files with an ``.exe`` extension that match your
395+
version of Python (e.g., ``py2.7`` if you installed Python 2.7). If
396+
you haven't already installed Python, you can get the official version
397+
from the `Python web site <http://python.org/download/>`_.

‎doc/faq/troubleshooting_faq.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ directory by default::
7070
If you would like to use a different configuration directory, you can
7171
do so by specifying the location in your :envvar:`MPLCONFIGDIR`
7272
environment variable -- see
73-
:ref:`setting-linux-osx-environment-variables`. Note that
73+
:ref:`setting-linux-osx-environment-variables`. Note that
7474
:envvar:`MPLCONFIGDIR` sets the location of both the configuration
7575
directory and the cache directory.
7676

@@ -101,9 +101,8 @@ please provide the following information in your e-mail to the
101101
python -c `import matplotlib; print matplotlib.__version__`
102102

103103
* where you obtained matplotlib (e.g., your Linux distribution's
104-
packages or the matplotlib Sourceforge site, or
105-
Anaconda_ or
106-
`Enthought Canopy <https://www.enthought.com/products/canopy/>`_).
104+
packages, github, PyPi, or Anaconda_ or `Enthought Canopy
105+
<https://www.enthought.com/products/canopy/>`_).
107106

108107
.. _Anaconda: https://store.continuum.io/cshop/anaconda/
109108

@@ -168,9 +167,9 @@ simple test script in debug mode::
168167

169168
and post :file:`build.out` and :file:`run.out` to the
170169
`matplotlib-devel
171-
<http://lists.sourceforge.net/mailman/listinfo/matplotlib-devel>`_
170+
<http://mail.python.org/mailman/listinfo/matplotlib-devel>`_
172171
mailing list (please do not post git problems to the `users list
173-
<http://lists.sourceforge.net/mailman/listinfo/matplotlib-users>`_).
172+
<https://mail.python.org/mailman/listinfo/matplotlib-users>`_).
174173

175174
Of course, you will want to clearly describe your problem, what you
176175
are expecting and what you are getting, but often a clean build and

‎doc/faq/usage_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ macosx Cocoa rendering in OSX windows
437437
is in non-interactive mode)
438438
============ ================================================================
439439

440-
.. _`Anti-Grain Geometry`: http://agg.sourceforge.net/antigrain.com/index.html
440+
.. _`Anti-Grain Geometry`: http://antigrain.com/
441441
.. _Postscript: http://en.wikipedia.org/wiki/PostScript
442442
.. _`Portable Document Format`: http://en.wikipedia.org/wiki/Portable_Document_Format
443443
.. _`Scalable Vector Graphics`: http://en.wikipedia.org/wiki/Scalable_Vector_Graphics

‎doc/glossary/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Glossary
88
.. glossary::
99

1010
AGG
11-
The Anti-Grain Geometry (`Agg <http://agg.sourceforge.net/antigrain.com/index.html>`_) rendering engine, capable of rendering
11+
The Anti-Grain Geometry (`Agg <http://antigrain.com/>`_) rendering engine, capable of rendering
1212
high-quality images
1313

1414
Cairo
1515
The `Cairo graphics <http://cairographics.org>`_ engine
1616

1717

1818
dateutil
19-
The `dateutil <http://labix.org/python-dateutil>`_ library
19+
The `dateutil <https://dateutil.readthedocs.org>`_ library
2020
provides extensions to the standard datetime module
2121

2222
EPS

‎doc/mpl_toolkits/index.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@ Natgrid
135135

136136
mpl_toolkits.natgrid is an interface to natgrid C library for gridding
137137
irregularly spaced data. This requires a separate installation of the
138-
natgrid toolkit from the sourceforge `download
139-
<http://sourceforge.net/project/showfiles.php?group_id=80706&package_id=142792>`_
140-
page.
138+
`natgrid toolkit <http://github.com/matplotlib/natgrid>`__.
141139

142140

143141
.. _toolkit_matplotlibvenn:

‎doc/pyplots/tex_demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
You can use TeX to render all of your matplotlib text if the rc
55
parameter text.usetex is set. This works currently on the agg and ps
66
backends, and requires that you have tex and the other dependencies
7-
described at http://matplotlib.sf.net/matplotlib.texmanager.html
7+
described at http://matplotlib.org/users/usetex.html
88
properly installed on your system. The first time you run a script
99
you will see a lot of output from tex and associated tools. The next
1010
time, the run may be silent, as a lot of the information is cached in

‎doc/resources/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
Books, Chapters and Articles
1010
=============================
1111

12+
* `Mastering matplotlib
13+
<https://www.packtpub.com/big-data-and-business-intelligence/mastering-matplotlib>`_
14+
by Duncan M. McGreggor
15+
1216
* `Interactive Applications Using Matplotlib
1317
<https://www.packtpub.com/application-development/interactive-applications-using-matplotlib>`_
1418
by Benjamin Root

‎doc/users/intro.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ backends: PS creates `PostScript®
7373
<http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
7474
creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
7575
hardcopy, Agg creates PNG output using the high quality `Anti-Grain
76-
Geometry <http://agg.sourceforge.net/antigrain.com/index.html>`_
76+
Geometry <http://antigrain.com/>`_
7777
library that ships with matplotlib, GTK embeds matplotlib in a
7878
`Gtk+ <http://www.gtk.org/>`_
7979
application, GTKAgg uses the Anti-Grain renderer to create a figure
@@ -92,5 +92,3 @@ embed matplotlib in a Gtk+ EEG application that runs on Windows, Linux
9292
and Macintosh OS X.
9393

9494
.. [*] MATLAB is a registered trademark of The MathWorks, Inc.
95-
96-

‎doc/users/screenshots.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,9 @@ rendering of strings with the *usetex* option.
279279
EEG demo
280280
=========
281281

282-
You can embed matplotlib into pygtk, wx, Tk, FLTK, or Qt
283-
applications. Here is a screenshot of an EEG viewer called pbrain,
284-
which is part of the NeuroImaging in Python suite
285-
`NIPY <http://nipy.sourceforge.net/nipy/stable/index.html>`_.
282+
You can embed matplotlib into pygtk, wx, Tk, FLTK, or Qt applications.
283+
Here is a screenshot of an EEG viewer called `pbrain
284+
<http://github.com/nipy/pbrain>`__.
286285

287286
.. image:: ../_static/eeg_small.png
288287

‎doc/users/usetex.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Troubleshooting
151151
* If you still need help, please see :ref:`reporting-problems`
152152

153153
.. _LaTeX: http://www.tug.org
154-
.. _dvipng: http://sourceforge.net/projects/dvipng
154+
.. _dvipng: http://www.nongnu.org/dvipng/
155155
.. _Ghostscript: http://www.cs.wisc.edu/~ghost/
156156
.. _PSNFSS: http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf
157157
.. _Poppler: http://poppler.freedesktop.org/

0 commit comments

Comments
 (0)