diff --git a/INSTALL b/INSTALL index 4dc29cdd82ed..a81ae7e1a104 100644 --- a/INSTALL +++ b/INSTALL @@ -66,12 +66,12 @@ you will also need to install compatible versions of `pyparsing `_, and `cycler `_ in addition to -`matplotlib `_. +`matplotlib `_. For Python 3.5 the `Visual C++ Redistributable for Visual Studio 2015 `_ needs to be installed. -In case Python 2.6 to 3.4 are not installed for all users (not the default), +In case Python 2.6 to 3.4 are not installed for all users (not the default), the Microsoft Visual C++ 2008 ( `64 bit `__ or @@ -109,19 +109,18 @@ standard Python shell or IPython. It is enabled as the default backend for the official binaries. GTK3 is not supported on Windows. The Windows installers (:file:`*.exe`) and wheels (:file:`*.whl`) on -the `download page `_ do not -contain test data or example code. -If you want to try the many demos that come in the matplotlib source -distribution, download the :file:`*.tar.gz` file and look in the -:file:`examples` subdirectory. +the `PyPI download page `_ do +not contain test data or example code. If you want to try the many +demos that come in the matplotlib source distribution, download the +:file:`*.tar.gz` file and look in the :file:`examples` subdirectory. To run the test suite, copy the :file:`lib\matplotlib\tests` and -:file:`lib\mpl_toolkits\tests` directories from the source distribution to -:file:`sys.prefix\Lib\site-packages\matplotlib` and -:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and install -`nose `_, -`mock `_, -Pillow, MiKTeX, GhostScript, ffmpeg, avconv, mencoder, ImageMagick, and -`Inkscape `_. +:file:`lib\mpl_toolkits\tests` directories from the source +distribution to :file:`sys.prefix\Lib\site-packages\matplotlib` and +:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and +install `nose `_, `mock +`_, Pillow, MiKTeX, GhostScript, +ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape +`_. @@ -133,10 +132,10 @@ 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 `the download page -`_, or if you want -to develop matplotlib or just need the latest bugfixed version, grab -the latest git version :ref:`install-from-git`. +the latest *tar.gz* release file from `the PyPI files page +`_, or if you want to +develop matplotlib or just need the latest bugfixed version, grab the +latest git version :ref:`install-from-git`. The standard environment variables `CC`, `CXX`, `PKG_CONFIG` are respected. This means you can set them if your toolchain is prefixed. This may be used for diff --git a/doc/_templates/index.html b/doc/_templates/index.html index 9a7ca0ba40ce..664b42a05e57 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -96,11 +96,11 @@

John Hunter (1968-2012)

-

Download

+

Installation

Visit the - matplotlib downloads - page. + matplotlib + installation instructions..

Documentation

@@ -131,8 +131,8 @@

Need help?

the api docs, mailing list archives, and join the matplotlib -mailing lists Users, -Announce and +mailing lists Users, +Announce and Devel. Check out the matplotlib questions on stackoverflow. @@ -178,10 +178,13 @@

Citing matplotlib

Open source

-Please consider donating -to support matplotlib development or to the John Hunter Memorial Fund. +Please +consider donating +to the matplotlib project through the Numfocus organization or to +the John Hunter Memorial +Fund.

- +x

The matplotlib license is based on the Python Software Foundation (PSF) license. diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst index faf5cf619636..844b721437ea 100644 --- a/doc/devel/release_guide.rst +++ b/doc/devel/release_guide.rst @@ -90,84 +90,13 @@ Packaging :file:`release/win32` which you can use this to prepare the windows releases. -Posting files -============= - -Our current method is for the release manager to collect all of the -binaries from the platform builders and post the files online on -Sourceforge. It is also possible that those building the binaries -could upload to directly to Sourceforge. We also post a source -tarball to PyPI, since ``pip`` no longer trusts files downloaded from -other sites. - -There are many ways to upload files to Sourceforge (`scp`, `rsync`, -`sftp`, and a web interface) described in `Sourceforge Release File -System documentation -`_. -Below, we will use `sftp`. - -1. Create a directory containing all of the release files and `cd` to it. - -2. `sftp` to Sourceforge:: - - sftp USERNAME@frs.sourceforge.net:/home/frs/project/matplotlib/matplotlib - -3. Make a new directory for the release and move to it:: - - mkdir matplotlib-1.1.0rc1 - cd matplotlib-1.1.0rc1 - -4. Upload all of the files in the current directory on your local machine:: - - put * - -If this release is a final release, the default download for the -matplotlib project should also be updated. Login to Sourceforge and -visit the `matplotlib files page -`_. -Navigate to the tarball of the release you just updated, click on -"Details" icon (it looks like a lower case ``i``), and make it the -default download for all platforms. - -There is a list of direct links to downloads on matplotlib's main -website. This needs to be manually generated and updated every time -new files are posted. - -1. Clone the matplotlib documentation repository and `cd` into it:: - - git clone git@github.com:matplotlib/matplotlib.github.com.git - cd matplotlib.github.com - -2. Update the list of downloads that you want to display by editing - the `downloads.txt` file. Generally, this should contain the last two - final releases and any active release candidates. - -3. Update the downloads webpage by running the `update_downloads.py` - script. This script requires `paramiko` (for `sftp` support) and - `jinja2` for templating. Both of these dependencies can be - installed using pip:: - - pip install paramiko - pip install jinja2 - - Then update the download page:: - - ./update_downloads.py - - You will be prompted for your Sourceforge username and password. - -4. Commit the changes and push them up to github:: - - git commit -m "Updating download list" - git push Update PyPI =========== -Once the tarball has been posted on Sourceforge, you can register a -link to the new release on PyPI. This should only be done with final -(non-release-candidate) releases, since doing so will hide any -available stable releases. +This step tells PyPI about the release and uploads a source +tarball. This should only be done with final (non-release-candidate) +releases, since doing so will hide any available stable releases. You may need to set up your `.pypirc` file as described in the `distutils register command documentation diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 11da0e79f631..11c63aceae4a 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -597,7 +597,7 @@ in these environments. Most importantly, you need to decide what kinds of images you want to generate (PNG, PDF, SVG) and configure the appropriate default backend. For 99% of users, this will be the Agg backend, which uses the C++ -`antigrain `_ +`antigrain `_ rendering engine to make nice PNGs. The Agg backend is also configured to recognize requests to generate other output formats (PDF, PS, EPS, SVG). The easiest way to configure matplotlib to use diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index b6bdd906bf04..d914f21dee98 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -390,8 +390,8 @@ Standalone binary installers for Windows If you have already installed Python and numpy, you can use one of the matplotlib binary installers for windows -- you can get these from the -`download `_ site. Chose the files with -an ``.exe`` extension that match your version of Python (e.g., ``py2.7`` if you -installed Python 2.7). If you haven't already installed Python, you can get -the official version from the `Python web site -`_. +`the PyPI matplotlib page `_ +site. Choose the files with an ``.exe`` extension that match your +version of Python (e.g., ``py2.7`` if you installed Python 2.7). If +you haven't already installed Python, you can get the official version +from the `Python web site `_. diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst index 652a754f6c40..37f863a5ea59 100644 --- a/doc/faq/troubleshooting_faq.rst +++ b/doc/faq/troubleshooting_faq.rst @@ -70,7 +70,7 @@ directory by default:: If you would like to use a different configuration directory, you can do so by specifying the location in your :envvar:`MPLCONFIGDIR` environment variable -- see -:ref:`setting-linux-osx-environment-variables`. Note that +:ref:`setting-linux-osx-environment-variables`. Note that :envvar:`MPLCONFIGDIR` sets the location of both the configuration directory and the cache directory. @@ -101,9 +101,8 @@ please provide the following information in your e-mail to the python -c `import matplotlib; print matplotlib.__version__` * where you obtained matplotlib (e.g., your Linux distribution's - packages or the matplotlib Sourceforge site, or - Anaconda_ or - `Enthought Canopy `_). + packages, github, PyPi, or Anaconda_ or `Enthought Canopy + `_). .. _Anaconda: https://store.continuum.io/cshop/anaconda/ @@ -168,9 +167,9 @@ simple test script in debug mode:: and post :file:`build.out` and :file:`run.out` to the `matplotlib-devel -`_ +`_ mailing list (please do not post git problems to the `users list -`_). +`_). Of course, you will want to clearly describe your problem, what you are expecting and what you are getting, but often a clean build and diff --git a/doc/faq/usage_faq.rst b/doc/faq/usage_faq.rst index 35a2600feada..f401c49737f2 100644 --- a/doc/faq/usage_faq.rst +++ b/doc/faq/usage_faq.rst @@ -437,7 +437,7 @@ macosx Cocoa rendering in OSX windows is in non-interactive mode) ============ ================================================================ -.. _`Anti-Grain Geometry`: http://agg.sourceforge.net/antigrain.com/index.html +.. _`Anti-Grain Geometry`: http://antigrain.com/ .. _Postscript: http://en.wikipedia.org/wiki/PostScript .. _`Portable Document Format`: http://en.wikipedia.org/wiki/Portable_Document_Format .. _`Scalable Vector Graphics`: http://en.wikipedia.org/wiki/Scalable_Vector_Graphics diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst index 95b5d63de142..fe75339287d2 100644 --- a/doc/glossary/index.rst +++ b/doc/glossary/index.rst @@ -8,7 +8,7 @@ Glossary .. glossary:: AGG - The Anti-Grain Geometry (`Agg `_) rendering engine, capable of rendering + The Anti-Grain Geometry (`Agg `_) rendering engine, capable of rendering high-quality images Cairo diff --git a/doc/mpl_toolkits/index.rst b/doc/mpl_toolkits/index.rst index bfb3ae556d35..ba3ae7efc305 100644 --- a/doc/mpl_toolkits/index.rst +++ b/doc/mpl_toolkits/index.rst @@ -135,9 +135,7 @@ Natgrid mpl_toolkits.natgrid is an interface to natgrid C library for gridding irregularly spaced data. This requires a separate installation of the -natgrid toolkit from the sourceforge `download -`_ -page. +`natgrid toolkit `__. .. _toolkit_matplotlibvenn: diff --git a/doc/pyplots/tex_demo.py b/doc/pyplots/tex_demo.py index a5288d749d86..7b228376e72c 100644 --- a/doc/pyplots/tex_demo.py +++ b/doc/pyplots/tex_demo.py @@ -4,7 +4,7 @@ You can use TeX to render all of your matplotlib text if the rc parameter text.usetex is set. This works currently on the agg and ps backends, and requires that you have tex and the other dependencies -described at http://matplotlib.sf.net/matplotlib.texmanager.html +described at http://matplotlib.org/users/usetex.html properly installed on your system. The first time you run a script you will see a lot of output from tex and associated tools. The next time, the run may be silent, as a lot of the information is cached in diff --git a/doc/users/intro.rst b/doc/users/intro.rst index 4a99955811f7..903f24264fca 100644 --- a/doc/users/intro.rst +++ b/doc/users/intro.rst @@ -73,7 +73,7 @@ backends: PS creates `PostScript® `_ hardcopy, SVG creates `Scalable Vector Graphics `_ hardcopy, Agg creates PNG output using the high quality `Anti-Grain -Geometry `_ +Geometry `_ library that ships with matplotlib, GTK embeds matplotlib in a `Gtk+ `_ 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 and Macintosh OS X. .. [*] MATLAB is a registered trademark of The MathWorks, Inc. - - diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst index 5d72d8df827b..57001fa763c1 100644 --- a/doc/users/screenshots.rst +++ b/doc/users/screenshots.rst @@ -279,10 +279,9 @@ rendering of strings with the *usetex* option. EEG demo ========= -You can embed matplotlib into pygtk, wx, Tk, FLTK, or Qt -applications. Here is a screenshot of an EEG viewer called pbrain, -which is part of the NeuroImaging in Python suite -`NIPY `_. +You can embed matplotlib into pygtk, wx, Tk, FLTK, or Qt applications. +Here is a screenshot of an EEG viewer called `pbrain +`__. .. image:: ../_static/eeg_small.png diff --git a/doc/users/usetex.rst b/doc/users/usetex.rst index fb8ebdc2f85a..52a82f1a1b3e 100644 --- a/doc/users/usetex.rst +++ b/doc/users/usetex.rst @@ -151,7 +151,7 @@ Troubleshooting * If you still need help, please see :ref:`reporting-problems` .. _LaTeX: http://www.tug.org -.. _dvipng: http://sourceforge.net/projects/dvipng +.. _dvipng: http://www.nongnu.org/dvipng/ .. _Ghostscript: http://www.cs.wisc.edu/~ghost/ .. _PSNFSS: http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf .. _Poppler: http://poppler.freedesktop.org/ diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst index cee2704fa199..6bed0acfb466 100644 --- a/doc/users/whats_new.rst +++ b/doc/users/whats_new.rst @@ -2000,9 +2000,9 @@ figures since the last call. Eric has done a lot of testing on the user interface toolkits and versions and platforms he has access to, but it is not possible to test them all, so please report problems to the `mailing list -`_ +`_. +`_. mplot3d graphs can be embedded in arbitrary axes diff --git a/examples/README.txt b/examples/README.txt index 34ad3b71db09..4cd6bafca2c2 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -17,16 +17,12 @@ directories found here: * animation - dynamic plots, see the tutorial at http://www.scipy.org/Cookbook/Matplotlib/Animations - * api - working with the matplotlib API directory. See the - doc/artist_api_tut.txt in the matplotlib src directory ((PDF at - http://matplotlib.sf.net/pycon) + * api - working with the matplotlib API directory. * axes_grid - Examples related to the AxesGrid toolkit * event_handling - how to interact with your figure, mouse presses, - key presses, object picking, etc. See the event handling tutorial - in the "doc" directory of the source distribution (PDF at - http://matplotlib.sf.net/pycon) + key presses, object picking, etc. * misc - some miscellaneous examples. some demos for loading and working with record arrays diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 8f7378e9ef78..89a2fb1b1222 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1076,8 +1076,9 @@ def _rc_params_in_file(fname, fail_on_error=False): Bad key "%s" on line %d in %s. You probably need to get an updated matplotlibrc file from -http://matplotlib.sf.net/_static/matplotlibrc or from the matplotlib source -distribution""" % (key, cnt, fname), file=sys.stderr) +http://github.com/matplotlib/matplotlib/blob/master/matplotlibrc.template +or from the matplotlib source distribution""" % (key, cnt, fname), + file=sys.stderr) return config diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py index 788c974ff614..db8370ab9c73 100644 --- a/lib/matplotlib/mlab.py +++ b/lib/matplotlib/mlab.py @@ -3417,12 +3417,11 @@ def griddata(x, y, z, xi, yi, interp='nn'): try: from mpl_toolkits.natgrid import _natgrid except ImportError: - raise RuntimeError("To use interp='nn' (Natural Neighbor " - "interpolation) in griddata, natgrid must be " - "installed. Either install it from http://" - "sourceforge.net/projects/matplotlib/files/" - "matplotlib-toolkits, or use interp='linear' " - "instead.") + raise RuntimeError( + "To use interp='nn' (Natural Neighbor interpolation) in " + "griddata, natgrid must be installed. Either install it " + "from http://github.com/matplotlib/natgrid or use " + "interp='linear' instead.") if xi.ndim == 2: # natgrid expects 1D xi and yi arrays. diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py index 59468c0aea8e..174f1f37a03a 100644 --- a/lib/matplotlib/texmanager.py +++ b/lib/matplotlib/texmanager.py @@ -26,8 +26,8 @@ Z = self.texmanager.get_rgba(s, size=12, dpi=80, rgb=(1,0,0)) To enable tex rendering of all text in your matplotlib figure, set -text.usetex in your matplotlibrc file (http://matplotlib.sf.net/matplotlibrc) -or include these two lines in your script:: +text.usetex in your matplotlibrc file or include these two lines in +your script:: from matplotlib import rc rc('text', usetex=True) diff --git a/setup.py b/setup.py index 90e2edd4e491..1e880c23c107 100644 --- a/setup.py +++ b/setup.py @@ -366,7 +366,7 @@ def run_tests(self): package_dir=package_dir, package_data=package_data, classifiers=classifiers, - download_url="https://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-{0}/matplotlib-{0}.tar.gz".format(__version__), + download_url="http://matplotlib.org/users/installing.html", # List third-party Python packages that we require install_requires=install_requires,