From 6ec29e6a6b2a84eeb0c8e4546fc7ac66bbcb231a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 27 Dec 2016 18:19:25 +0000 Subject: [PATCH 1/5] Add https --- doc/devel/MEP/MEP12.rst | 10 +++---- doc/devel/contributing.rst | 4 +-- doc/devel/documenting_mpl.rst | 2 +- doc/devel/gitwash/development_workflow.rst | 4 +-- doc/devel/gitwash/forking_hell.rst | 2 +- doc/devel/gitwash/git_links.inc | 16 +++++------ doc/devel/gitwash/known_projects.inc | 16 +++++------ doc/devel/gitwash/this_project.inc | 2 +- doc/devel/license.rst | 4 +-- doc/devel/release_guide.rst | 2 +- doc/devel/testing.rst | 8 +++--- doc/faq/howto_faq.rst | 2 +- doc/faq/installing_faq.rst | 4 +-- doc/faq/osx_framework.rst | 2 +- doc/faq/troubleshooting_faq.rst | 2 +- doc/faq/usage_faq.rst | 24 ++++++++-------- doc/glossary/index.rst | 32 +++++++++++----------- doc/mpl_toolkits/index.rst | 2 +- doc/resources/index.rst | 4 +-- doc/thirdpartypackages/index.rst | 2 +- doc/users/artists.rst | 2 +- doc/users/colormaps.rst | 8 +++--- doc/users/intro.rst | 6 ++-- doc/users/license.rst | 2 +- doc/users/path_tutorial.rst | 2 +- doc/users/pgf.rst | 2 +- doc/users/prev_whats_new/whats_new_1.0.rst | 2 +- doc/users/screenshots.rst | 4 +-- doc/users/text_props.rst | 2 +- doc/users/transforms_tutorial.rst | 2 +- doc/users/usetex.rst | 2 +- lib/matplotlib/backend_bases.py | 2 +- lib/matplotlib/cbook.py | 4 +-- lib/matplotlib/sankey.py | 2 +- 34 files changed, 93 insertions(+), 93 deletions(-) diff --git a/doc/devel/MEP/MEP12.rst b/doc/devel/MEP/MEP12.rst index 573083ada5c3..61592ab127dc 100644 --- a/doc/devel/MEP/MEP12.rst +++ b/doc/devel/MEP/MEP12.rst @@ -141,8 +141,8 @@ page instead of the gallery examples. references to that example. For example, the API documentation for `axes.py` and `pyplot.py` may use these examples to generate plots. Use your favorite search tool (e.g., grep, ack, `grin -`_, `pss -`_) to search the matplotlib +`_, `pss +`_) to search the matplotlib package. See `2dc9a46 `_ and `aa6b410 @@ -192,10 +192,10 @@ the entry point to these examples, and sections could really help users navigate the gallery. Thus, tags are complementary to this reorganization. -.. _PEP8: http://www.python.org/dev/peps/pep-0008/ +.. _PEP8: https://www.python.org/dev/peps/pep-0008/ -.. [1] http://github.com/matplotlib/matplotlib/pull/714 -.. [2] http://github.com/matplotlib/matplotlib/issues/524 +.. [1] https://github.com/matplotlib/matplotlib/pull/714 +.. [2] https://github.com/matplotlib/matplotlib/issues/524 .. [3] http://matplotlib.1069221.n5.nabble.com/Matplotlib-gallery-td762.html#a33379091 .. [4] http://www.loria.fr/~rougier/teaching/matplotlib/ .. [5] http://www.loria.fr/~rougier/coding/gallery/ diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst index 83a6fba2938e..761fbbd87f53 100644 --- a/doc/devel/contributing.rst +++ b/doc/devel/contributing.rst @@ -70,10 +70,10 @@ You can then run the tests to check your work environment is set up properly:: .. _pep8: https://pep8.readthedocs.io/en/latest/ .. note:: - + **Additional dependencies for testing**: nose_ (version 1.0 or later), `mock `_ (if python < 3.3), `Ghostscript - `_, `Inkscape `_ + `_, `Inkscape `_ .. note:: To make sure the tests run locally: diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst index cdb4a765c524..b6ca7ffc5e89 100644 --- a/doc/devel/documenting_mpl.rst +++ b/doc/devel/documenting_mpl.rst @@ -333,7 +333,7 @@ purposes, like hosting google docs or youtube videos. You can embed a matplotlib animation in the docs by first saving the animation as a movie using :meth:`matplotlib.animation.Animation.save`, and then uploading to `matplotlib's youtube -channel `_ and inserting the +channel `_ and inserting the embedding string youtube provides like:: .. raw:: html diff --git a/doc/devel/gitwash/development_workflow.rst b/doc/devel/gitwash/development_workflow.rst index 2399758c061a..9251d4a413e3 100644 --- a/doc/devel/gitwash/development_workflow.rst +++ b/doc/devel/gitwash/development_workflow.rst @@ -125,7 +125,7 @@ sure your pull request is ready for merging. #. Go to your repo URL |emdash| e.g., - ``http://github.com/your-user-name/matplotlib``. + ``https://github.com/your-user-name/matplotlib``. #. Select your feature branch from the drop down menu: @@ -162,7 +162,7 @@ all your commits to the updated upstream commit. For a much more detailed explanation (with pictures!) see `this nice write up `_. The NumPy team has also `documented how to do this -`_. +`_. In general, re-writing history, particularly published history, is considered bad practice, but in this case it is very useful. diff --git a/doc/devel/gitwash/forking_hell.rst b/doc/devel/gitwash/forking_hell.rst index 261ae775d7dc..50dda65f1642 100644 --- a/doc/devel/gitwash/forking_hell.rst +++ b/doc/devel/gitwash/forking_hell.rst @@ -5,7 +5,7 @@ Making your own copy (fork) of matplotlib ========================================== You need to do this only once. The instructions here are very similar -to the instructions at http://help.github.com/forking/ |emdash| please see +to the instructions at https://help.github.com/forking/ |emdash| please see that page for more detail. We're repeating some of it here just to give the specifics for the matplotlib_ project, and to suggest some default names. diff --git a/doc/devel/gitwash/git_links.inc b/doc/devel/gitwash/git_links.inc index e4c76a219f45..1411625ad9da 100644 --- a/doc/devel/gitwash/git_links.inc +++ b/doc/devel/gitwash/git_links.inc @@ -9,19 +9,19 @@ nipy, NIPY, Nipy, etc... .. git stuff -.. _git: http://git-scm.com/ -.. _github: http://github.com -.. _github help: http://help.github.com +.. _git: https://git-scm.com/ +.. _github: https://github.com +.. _github help: https://help.github.com .. _msysgit: http://code.google.com/p/msysgit/downloads/list .. _git-osx-installer: http://code.google.com/p/git-osx-installer/downloads/list .. _subversion: http://subversion.tigris.org/ -.. _git cheat sheet: http://github.com/guides/git-cheat-sheet +.. _git cheat sheet: https://github.com/guides/git-cheat-sheet .. _pro git book: http://progit.org/ -.. _git svn crash course: http://git-scm.com/course/svn.html +.. _git svn crash course: https://git-scm.com/course/svn.html .. _learn.github: http://learn.github.com/ -.. _network graph visualizer: http://github.com/blog/39-say-hello-to-the-network-graph-visualizer -.. _git user manual: http://schacon.github.com/git/user-manual.html -.. _git tutorial: http://schacon.github.com/git/gittutorial.html +.. _network graph visualizer: https://github.com/blog/39-say-hello-to-the-network-graph-visualizer +.. _git user manual: https://schacon.github.com/git/user-manual.html +.. _git tutorial: https://schacon.github.com/git/gittutorial.html .. _git community book: https://git-scm.com/book/en/v2 .. _git ready: http://www.gitready.com/ .. _git casts: http://www.gitcasts.com/ diff --git a/doc/devel/gitwash/known_projects.inc b/doc/devel/gitwash/known_projects.inc index afbc85844ea5..05a961d85198 100644 --- a/doc/devel/gitwash/known_projects.inc +++ b/doc/devel/gitwash/known_projects.inc @@ -2,40 +2,40 @@ .. PROJECTNAME placeholders .. _PROJECTNAME: http://neuroimaging.scipy.org -.. _`PROJECTNAME github`: http://github.com/nipy +.. _`PROJECTNAME github`: https://github.com/nipy .. _`PROJECTNAME mailing list`: http://projects.scipy.org/mailman/listinfo/nipy-devel .. numpy .. _numpy: hhttp://numpy.scipy.org -.. _`numpy github`: http://github.com/numpy/numpy +.. _`numpy github`: https://github.com/numpy/numpy .. _`numpy mailing list`: http://mail.scipy.org/mailman/listinfo/numpy-discussion .. scipy .. _scipy: http://www.scipy.org -.. _`scipy github`: http://github.com/scipy/scipy +.. _`scipy github`: https://github.com/scipy/scipy .. _`scipy mailing list`: http://mail.scipy.org/mailman/listinfo/scipy-dev .. nipy .. _nipy: http://nipy.org/nipy -.. _`nipy github`: http://github.com/nipy/nipy +.. _`nipy github`: https://github.com/nipy/nipy .. _`nipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel .. ipython .. _ipython: http://ipython.org -.. _`ipython github`: http://github.com/ipython/ipython +.. _`ipython github`: https://github.com/ipython/ipython .. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev .. dipy .. _dipy: http://nipy.org/dipy -.. _`dipy github`: http://github.com/Garyfallidis/dipy +.. _`dipy github`: https://github.com/Garyfallidis/dipy .. _`dipy mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel .. nibabel .. _nibabel: http://nipy.org/nibabel -.. _`nibabel github`: http://github.com/nipy/nibabel +.. _`nibabel github`: https://github.com/nipy/nibabel .. _`nibabel mailing list`: http://mail.scipy.org/mailman/listinfo/nipy-devel .. marsbar .. _marsbar: http://marsbar.sourceforge.net -.. _`marsbar github`: http://github.com/matthew-brett/marsbar +.. _`marsbar github`: https://github.com/matthew-brett/marsbar .. _`MarsBaR mailing list`: https://lists.sourceforge.net/lists/listinfo/marsbar-users diff --git a/doc/devel/gitwash/this_project.inc b/doc/devel/gitwash/this_project.inc index b3caf5327438..471a9e9d10f2 100644 --- a/doc/devel/gitwash/this_project.inc +++ b/doc/devel/gitwash/this_project.inc @@ -1,5 +1,5 @@ .. matplotlib .. _matplotlib: http://matplotlib.org -.. _`matplotlib github`: http://github.com/matplotlib/matplotlib +.. _`matplotlib github`: https://github.com/matplotlib/matplotlib .. _`matplotlib mailing list`: https://mail.python.org/mailman/listinfo/matplotlib-devel diff --git a/doc/devel/license.rst b/doc/devel/license.rst index fb591661f2c2..0a2577e54ec0 100644 --- a/doc/devel/license.rst +++ b/doc/devel/license.rst @@ -6,7 +6,7 @@ Licenses Matplotlib only uses BSD compatible code. If you bring in code from another project make sure it has a PSF, BSD, MIT or compatible license (see the Open Source Initiative `licenses page -`_ for details on individual +`_ for details on individual licenses). If it doesn't, you may consider contacting the author and asking them to relicense it. GPL and LGPL code are not acceptable in the main code base, though we are considering an alternative way of @@ -57,7 +57,7 @@ compatible). Also, we wanted to attract as many users and developers as possible, and many software companies will not use GPL code in software they plan to distribute, even those that are highly committed to open source development, such as `enthought -`_, out of legitimate concern that use of the +`_, out of legitimate concern that use of the GPL will "infect" their code base by its viral nature. In effect, they want to retain the right to release some proprietary code. Companies and institutions who use matplotlib often make significant diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst index cd99a36e49cb..d3ffbf9f8f97 100644 --- a/doc/devel/release_guide.rst +++ b/doc/devel/release_guide.rst @@ -100,7 +100,7 @@ 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 -`_. +`_. Then updating the record on PyPI is as simple as:: diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst index c4413f6c644a..3e1e22cab8d5 100644 --- a/doc/devel/testing.rst +++ b/doc/devel/testing.rst @@ -20,9 +20,9 @@ The following software is required to run the tests: - nose_, version 1.0 or later - `mock `_, when running python versions < 3.3 - - `Ghostscript `_ (to render PDF + - `Ghostscript `_ (to render PDF files) - - `Inkscape `_ (to render SVG files) + - `Inkscape `_ (to render SVG files) Optionally you can install: @@ -236,7 +236,7 @@ this module to the list of default tests, append its name to Using Travis CI --------------- -`Travis CI `_ is a hosted CI system "in the +`Travis CI `_ is a hosted CI system "in the cloud". Travis is configured to receive notifications of new commits to GitHub @@ -259,7 +259,7 @@ generally isn't necessary, since any pull request submitted against the main matplotlib repository will be tested. Once this is configured, you can see the Travis CI results at -http://travis-ci.org/your_GitHub_user_name/matplotlib -- here's `an +https://travis-ci.org/your_GitHub_user_name/matplotlib -- here's `an example `_. diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 4e7ea7f5def7..05fea10e0e0b 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -585,7 +585,7 @@ compiling matplotlib for windows? Write a FAQ or a section for the Write a tutorial on the signal analysis plotting functions like :func:`~matplotlib.pyplot.xcorr`, :func:`~matplotlib.pyplot.psd` and :func:`~matplotlib.pyplot.specgram`. Do you use matplotlib with -`django `_ or other popular web +`django `_ or other popular web application servers? Write a FAQ or tutorial and we'll find a place for it in the :ref:`users-guide-index`. Bundle matplotlib in a `py2exe `_ app? ... I think you get the idea. diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index 05e03b73a2a5..fefa86b8f129 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -186,7 +186,7 @@ Canopy web pages for more information. Other options for a fresh Python install are the standard installer from `python.org `_, or installing Python using a general OSX package management system such as `homebrew -`_ or `macports `_. Power users on +`_ or `macports `_. Power users on OSX will likely want one of homebrew or macports on their system to install open source software packages, but it is perfectly possible to use these systems with another source for your Python binary, such as Anaconda, Canopy @@ -197,7 +197,7 @@ or Python.org Python. Installing OSX binary wheels ---------------------------- -If you are using recent Python from http://www.python.org, Macports or +If you are using recent Python from https://www.python.org, Macports or Homebrew, then you can use the standard pip installer to install matplotlib binaries in the form of wheels. diff --git a/doc/faq/osx_framework.rst b/doc/faq/osx_framework.rst index 31807b43bb91..b1cdb2719b39 100644 --- a/doc/faq/osx_framework.rst +++ b/doc/faq/osx_framework.rst @@ -104,7 +104,7 @@ build within the virtual environment you can do ``frameworkpython -m IPython`` ^^^^^^^^^^^^^^^^^^^^^ An alternative work around borrowed from the `WX wiki -`_, is to use the non +`_, is to use the non virtualenv python along with the PYTHONHOME environment variable. This can be implemented in a script as below. To use this modify ``PYVER`` and ``PATHTOPYTHON`` and put the script in the virtualenv bin directory i.e. diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst index 37f863a5ea59..e2b5111dff49 100644 --- a/doc/faq/troubleshooting_faq.rst +++ b/doc/faq/troubleshooting_faq.rst @@ -167,7 +167,7 @@ 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 `_). diff --git a/doc/faq/usage_faq.rst b/doc/faq/usage_faq.rst index f67593a6df53..33d523381361 100644 --- a/doc/faq/usage_faq.rst +++ b/doc/faq/usage_faq.rst @@ -376,8 +376,8 @@ For example, with GTK, you can also select GDK rendering (backend ``GTK`` deprecated in 2.0) or Cairo rendering (backend ``GTKCairo``). For the rendering engines, one can also distinguish between `vector -`_ or `raster -`_ renderers. Vector +`_ or `raster +`_ renderers. Vector graphics languages issue drawing commands like "draw a line from this point to this point" and hence are scale free, and raster backends generate a pixel representation of the line whose accuracy depends on a @@ -441,19 +441,19 @@ macosx Cocoa rendering in OSX windows ============ ================================================================ .. _`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 -.. _`Cairo graphics`: http://en.wikipedia.org/wiki/Cairo_(graphics) -.. _`Gimp Drawing Kit`: http://en.wikipedia.org/wiki/GDK +.. _Postscript: https://en.wikipedia.org/wiki/PostScript +.. _`Portable Document Format`: https://en.wikipedia.org/wiki/Portable_Document_Format +.. _`Scalable Vector Graphics`: https://en.wikipedia.org/wiki/Scalable_Vector_Graphics +.. _`Cairo graphics`: https://en.wikipedia.org/wiki/Cairo_(graphics) +.. _`Gimp Drawing Kit`: https://en.wikipedia.org/wiki/GDK .. _PyGTK: http://www.pygtk.org .. _PyGObject: https://live.gnome.org/PyGObject -.. _pycairo: http://www.cairographics.org/pycairo/ +.. _pycairo: https://www.cairographics.org/pycairo/ .. _cairocffi: https://pythonhosted.org/cairocffi/ -.. _wxPython: http://www.wxpython.org/ -.. _TkInter: http://wiki.python.org/moin/TkInter -.. _PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro -.. _PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro +.. _wxPython: https://www.wxpython.org/ +.. _TkInter: https://wiki.python.org/moin/TkInter +.. _PyQt4: https://riverbankcomputing.com/software/pyqt/intro +.. _PyQt5: https://riverbankcomputing.com/software/pyqt/intro WX backends =========== diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst index 468896d86977..b694132c19d6 100644 --- a/doc/glossary/index.rst +++ b/doc/glossary/index.rst @@ -12,7 +12,7 @@ Glossary high-quality images Cairo - The `Cairo graphics `_ engine + The `Cairo graphics `_ engine dateutil @@ -20,10 +20,10 @@ Glossary provides extensions to the standard datetime module EPS - Encapsulated Postscript (`EPS `_) + Encapsulated Postscript (`EPS `_) FreeType - `FreeType `_ is a font rasterization + `FreeType `_ is a font rasterization library used by matplotlib which supports TrueType, Type 1, and OpenType fonts. @@ -32,11 +32,11 @@ Glossary The Gimp Drawing Kit for GTK+ GTK - The GIMP Toolkit (`GTK `_) graphical user interface library + The GIMP Toolkit (`GTK `_) graphical user interface library JPG The Joint Photographic Experts Group (`JPEG - `_) compression method and + `_) compression method and file format for photographic images numpy @@ -47,17 +47,17 @@ Glossary deviation, fourier transforms, and convolutions. PDF - Adobe's Portable Document Format (`PDF `_) + Adobe's Portable Document Format (`PDF `_) PNG Portable Network Graphics (`PNG - `_), a raster graphics format + `_), a raster graphics format that employs lossless data compression which is more suitable for line art than the lossy jpg format. Unlike the gif format, png is not encumbered by requirements for a patent license. PS - Postscript (`PS `_) is a + Postscript (`PS `_) is a vector graphics ASCII text language widely used in printers and publishing. Postscript was developed by adobe systems and is starting to show its age: for example is does not have an alpha @@ -71,14 +71,14 @@ Glossary 'python-gtk2' pyqt - `pyqt `_ provides python + `pyqt `_ provides python wrappers for the :term:`Qt` widgets library and is required by the matplotlib Qt5Agg and Qt4Agg backends. Widely used on linux and windows; many linux distributions package this as 'python-qt5' or 'python-qt4'. python - `python `_ is an object oriented interpreted + `python `_ is an object oriented interpreted language widely used for scripting, application development, web application servers, scientific computing and more. @@ -91,7 +91,7 @@ Glossary Qt - `Qt `__ is a cross-platform + `Qt `__ is a cross-platform application framework for desktop and embedded development. Qt4 @@ -106,7 +106,7 @@ Glossary raster graphics `Raster graphics - `_, or bitmaps, + `_, or bitmaps, represent an image as an array of pixels which is resolution dependent. Raster graphics are generally most practical for photo-realistic images, but do not scale easily without loss of @@ -114,12 +114,12 @@ Glossary SVG The Scalable Vector Graphics format (`SVG - `_). An XML based vector + `_). An XML based vector graphics format supported by many web browsers. TIFF Tagged Image File Format (`TIFF - `_) is a + `_) is a file format for storing images, including photographs and line art. @@ -131,7 +131,7 @@ Glossary vector graphics `vector graphics - `_ use geometrical + `_ use geometrical primitives based upon mathematical equations to represent images in computer graphics. Primitives can include points, lines, curves, and shapes or polygons. Vector graphics are scalable, @@ -141,7 +141,7 @@ Glossary typesetting and graphic design applications. wxpython - `wxpython `_ provides python wrappers + `wxpython `_ provides python wrappers for the :term:`wxWidgets` library for use with the WX and WXAgg backends. Widely used on linux, OS-X and windows, it is often packaged by linux distributions as 'python-wxgtk' diff --git a/doc/mpl_toolkits/index.rst b/doc/mpl_toolkits/index.rst index 3583fe20ec5b..b766c65a1ecf 100644 --- a/doc/mpl_toolkits/index.rst +++ b/doc/mpl_toolkits/index.rst @@ -72,4 +72,4 @@ Excel Tools ``mpl_toolkits.exceltools`` provides some utilities for working with Excel. This toolkit ships with matplotlib, but requires -`xlwt `_ +`xlwt `_ diff --git a/doc/resources/index.rst b/doc/resources/index.rst index 73b40630f47d..3631fd1abec2 100644 --- a/doc/resources/index.rst +++ b/doc/resources/index.rst @@ -37,11 +37,11 @@ Videos ======= -* `Plotting with matplotlib `_ +* `Plotting with matplotlib `_ by Mike Müller * `Introduction to NumPy and Matplotlib - `_ by Eric Jones + `_ by Eric Jones * `Anatomy of Matplotlib `_ diff --git a/doc/thirdpartypackages/index.rst b/doc/thirdpartypackages/index.rst index 0c81916ca5e9..011b4c082973 100644 --- a/doc/thirdpartypackages/index.rst +++ b/doc/thirdpartypackages/index.rst @@ -149,7 +149,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 `__. +`natgrid toolkit `__. .. _toolkit_matplotlibvenn: diff --git a/doc/users/artists.rst b/doc/users/artists.rst index 38c6e4dca560..860b0ee53e7a 100644 --- a/doc/users/artists.rst +++ b/doc/users/artists.rst @@ -14,7 +14,7 @@ a renderer to paint onto the canvas. The :class:`~matplotlib.backend_bases.FigureCanvas` and :class:`~matplotlib.backend_bases.Renderer` handle all the details of talking to user interface toolkits like `wxPython -`_ or drawing languages like PostScript®, and +`_ or drawing languages like PostScript®, and the ``Artist`` handles all the high level constructs like representing and laying out the figure, text, and lines. The typical user will spend 95% of his time working with the ``Artists``. diff --git a/doc/users/colormaps.rst b/doc/users/colormaps.rst index 793281b0c8af..bb59c7e90dc1 100644 --- a/doc/users/colormaps.rst +++ b/doc/users/colormaps.rst @@ -184,10 +184,10 @@ References .. [Ware] http://ccom.unh.edu/sites/default/files/publications/Ware_1988_CGA_Color_sequences_univariate_maps.pdf .. [Moreland] http://www.kennethmoreland.com/color-maps/ColorMapsExpanded.pdf .. [list-colormaps] https://gist.github.com/endolith/2719900#id7 -.. [mycarta-banding] http://mycarta.wordpress.com/2012/10/14/the-rainbow-is-deadlong-live-the-rainbow-part-4-cie-lab-heated-body/ -.. [mycarta-jet] http://mycarta.wordpress.com/2012/10/06/the-rainbow-is-deadlong-live-the-rainbow-part-3/ -.. [mycarta-lablinear] http://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/ -.. [mycarta-cubelaw] http://mycarta.wordpress.com/2013/02/21/perceptual-rainbow-palette-the-method/ +.. [mycarta-banding] https://mycarta.wordpress.com/2012/10/14/the-rainbow-is-deadlong-live-the-rainbow-part-4-cie-lab-heated-body/ +.. [mycarta-jet] https://mycarta.wordpress.com/2012/10/06/the-rainbow-is-deadlong-live-the-rainbow-part-3/ +.. [mycarta-lablinear] https://mycarta.wordpress.com/2012/12/06/the-rainbow-is-deadlong-live-the-rainbow-part-5-cie-lab-linear-l-rainbow/ +.. [mycarta-cubelaw] https://mycarta.wordpress.com/2013/02/21/perceptual-rainbow-palette-the-method/ .. [bw] http://www.tannerhelland.com/3643/grayscale-image-algorithm-vb6/ .. [colorblindness] http://www.color-blindness.com/ .. [vischeck] http://www.vischeck.com/vischeck/ diff --git a/doc/users/intro.rst b/doc/users/intro.rst index 9e1a109fca2a..ef05a547831c 100644 --- a/doc/users/intro.rst +++ b/doc/users/intro.rst @@ -2,7 +2,7 @@ Introduction ============ matplotlib is a library for making 2D plots of arrays in `Python -`_. Although it has its origins in emulating +`_. Although it has its origins in emulating the MATLAB |reg| [#]_ graphics commands, it is independent of MATLAB, and can be used in a Pythonic, object oriented way. Although matplotlib is written primarily in pure Python, it @@ -75,11 +75,11 @@ creates `Scalable Vector Graphics `_ hardcopy, Agg creates PNG output using the high quality `Anti-Grain Geometry `_ library that ships with matplotlib, GTK embeds matplotlib in a -`Gtk+ `_ +`Gtk+ `_ application, GTKAgg uses the Anti-Grain renderer to create a figure and embed it in a Gtk+ application, and so on for `PDF `_, `WxWidgets -`_, `Tkinter +`_, `Tkinter `_, etc. matplotlib is used by many people in many different contexts. Some diff --git a/doc/users/license.rst b/doc/users/license.rst index 65f9cc78708e..72c2f84c060b 100644 --- a/doc/users/license.rst +++ b/doc/users/license.rst @@ -8,7 +8,7 @@ License Matplotlib only uses BSD compatible code, and its license is based on the `PSF `_ license. See the Open Source Initiative `licenses page -`_ for details on individual +`_ for details on individual licenses. Non-BSD compatible licenses (e.g., LGPL) are acceptable in matplotlib toolkits. For a discussion of the motivations behind the licencing choice, see :ref:`license-discussion`. diff --git a/doc/users/path_tutorial.rst b/doc/users/path_tutorial.rst index a29bc1dcdb20..47a3891c6267 100644 --- a/doc/users/path_tutorial.rst +++ b/doc/users/path_tutorial.rst @@ -67,7 +67,7 @@ Bézier example Some of the path components require multiple vertices to specify them: for example CURVE 3 is a `bézier -`_ curve with one +`_ curve with one control point and one end point, and CURVE4 has three vertices for the two control points and the end point. The example below shows a CURVE4 Bézier spline -- the bézier curve will be contained in the diff --git a/doc/users/pgf.rst b/doc/users/pgf.rst index 88eabf802ca2..3d30967a3bd1 100644 --- a/doc/users/pgf.rst +++ b/doc/users/pgf.rst @@ -64,7 +64,7 @@ also use the LaTeX default Computer Modern fonts by clearing the lists for ``font.serif``, ``font.sans-serif`` or ``font.monospace``. Please note that the glyph coverage of these fonts is very limited. If you want to keep the Computer Modern font face but require extended unicode support, consider -installing the `Computer Modern Unicode `_ +installing the `Computer Modern Unicode `_ fonts *CMU Serif*, *CMU Sans Serif*, etc. When saving to ``.pgf``, the font configuration matplotlib used for the diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst index 940aac6e362c..3e84cdc77d98 100644 --- a/doc/users/prev_whats_new/whats_new_1.0.rst +++ b/doc/users/prev_whats_new/whats_new_1.0.rst @@ -71,7 +71,7 @@ but it is not possible to test them all, so please report problems to the `mailing list `__ and `bug tracker -`__. +`__. mplot3d graphs can be embedded in arbitrary axes diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst index 35f2810e9c39..7bf30859f87e 100644 --- a/doc/users/screenshots.rst +++ b/doc/users/screenshots.rst @@ -228,7 +228,7 @@ Mathtext_examples Below is a sampling of the many TeX expressions now supported by matplotlib's internal mathtext engine. The mathtext module provides TeX style mathematical -expressions using `FreeType `_ +expressions using `FreeType `_ and the DejaVu, BaKoMa computer modern, or `STIX `_ fonts. See the :mod:`matplotlib.mathtext` module for additional details. @@ -257,7 +257,7 @@ EEG demo You can embed matplotlib into pygtk, wx, Tk, or Qt applications. Here is a screenshot of an EEG viewer called `pbrain -`__. +`__. .. image:: ../_static/eeg_small.png diff --git a/doc/users/text_props.rst b/doc/users/text_props.rst index 407de47d38b5..6ec9c5047147 100644 --- a/doc/users/text_props.rst +++ b/doc/users/text_props.rst @@ -142,7 +142,7 @@ To control the font used on per-artist basis use the ``'name'``, `. -On linux, `fc-list `__ can be a +On linux, `fc-list `__ can be a useful tool to discover the font name; for example :: $ fc-list :lang=zh family diff --git a/doc/users/transforms_tutorial.rst b/doc/users/transforms_tutorial.rst index fedf693b9f03..269f54aa95a8 100644 --- a/doc/users/transforms_tutorial.rst +++ b/doc/users/transforms_tutorial.rst @@ -320,7 +320,7 @@ operator in:: showing that can chain transformations using the addition operator. This code says: first apply the data transformation ``ax.transData`` and then translate the data by `dx` and `dy` points. In typography, -a`point `_ is +a`point `_ is 1/72 inches, and by specifying your offsets in points, your figure will look the same regardless of the dpi resolution it is saved in. diff --git a/doc/users/usetex.rst b/doc/users/usetex.rst index 1e02f26e8b85..2b9157a2534b 100644 --- a/doc/users/usetex.rst +++ b/doc/users/usetex.rst @@ -154,5 +154,5 @@ Troubleshooting .. _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/ +.. _Poppler: https://poppler.freedesktop.org/ .. _Xpdf: http://www.foolabs.com/xpdf diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 2b6f5c72b484..0d21ef429e39 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -892,7 +892,7 @@ def get_dashes(self): off in pixels. See p107 of to PostScript `BLUEBOOK - `_ + `_ for more info. Default value is None diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index 426ca260c4c4..47efd9795319 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -41,7 +41,7 @@ class MatplotlibDeprecationWarning(UserWarning): allow for the signaling of deprecation, but via UserWarnings which are not ignored by default. - http://docs.python.org/dev/whatsnew/2.7.html#the-future-for-python-2-x + https://docs.python.org/dev/whatsnew/2.7.html#the-future-for-python-2-x """ pass @@ -2640,7 +2640,7 @@ class Locked(object): All Rights Reserved conda is distributed under the terms of the BSD 3-clause license. - Consult LICENSE_CONDA or http://opensource.org/licenses/BSD-3-Clause. + Consult LICENSE_CONDA or https://opensource.org/licenses/BSD-3-Clause. """ LOCKFN = '.matplotlib_lock' diff --git a/lib/matplotlib/sankey.py b/lib/matplotlib/sankey.py index c822f419122f..c5e69884368d 100644 --- a/lib/matplotlib/sankey.py +++ b/lib/matplotlib/sankey.py @@ -66,7 +66,7 @@ class Sankey(object): the width of the arrows is shown proportionally to the flow quantity. They are typically used to visualize energy or material or cost transfers between processes. - `Wikipedia (6/1/2011) `_ + `Wikipedia (6/1/2011) `_ """ From f2782173ca6a250eab8cca621d4881c9b95eea5e Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 27 Dec 2016 22:15:55 +0000 Subject: [PATCH 2/5] Mass link redirection update --- doc/api/api_changes.rst | 2 +- doc/conf.py | 2 +- doc/devel/MEP/MEP12.rst | 8 +++--- doc/devel/MEP/MEP13.rst | 2 +- doc/devel/MEP/MEP14.rst | 14 +++++----- doc/devel/MEP/MEP25.rst | 2 +- doc/devel/contributing.rst | 20 +++++++-------- doc/devel/documenting_mpl.rst | 8 +++--- doc/devel/gitwash/git_install.rst | 2 +- doc/devel/gitwash/git_links.inc | 38 ++++++++++++++-------------- doc/devel/testing.rst | 4 +-- doc/faq/howto_faq.rst | 2 +- doc/faq/installing_faq.rst | 10 ++++---- doc/faq/osx_framework.rst | 6 ++--- doc/faq/troubleshooting_faq.rst | 14 +++++----- doc/faq/usage_faq.rst | 8 +++--- doc/glossary/index.rst | 2 +- doc/resources/index.rst | 6 ++--- doc/thirdpartypackages/index.rst | 2 +- doc/users/credits.rst | 2 +- doc/users/event_handling.rst | 4 +-- doc/users/image_tutorial.rst | 14 +++++----- doc/users/intro.rst | 2 +- doc/users/license.rst | 2 +- doc/users/pgf.rst | 16 ++++++------ doc/users/pyplot_tutorial.rst | 2 +- doc/users/shell.rst | 2 +- doc/users/text_intro.rst | 2 +- doc/users/transforms_tutorial.rst | 1 - doc/users/usetex.rst | 2 +- lib/matplotlib/cbook.py | 6 ++--- lib/matplotlib/dates.py | 4 +-- lib/matplotlib/font_manager.py | 12 ++++----- lib/matplotlib/fontconfig_pattern.py | 8 +++--- lib/matplotlib/image.py | 2 +- lib/matplotlib/mlab.py | 2 +- lib/matplotlib/pyplot.py | 4 +-- lib/matplotlib/stackplot.py | 2 +- 38 files changed, 120 insertions(+), 121 deletions(-) diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst index b84a54be2e5b..ca523a94ad72 100644 --- a/doc/api/api_changes.rst +++ b/doc/api/api_changes.rst @@ -1071,7 +1071,7 @@ Configuration and rcParams * On Linux, the user-specific `matplotlibrc` configuration file is now located in `~/.config/matplotlib/matplotlibrc` to conform to the `XDG Base Directory Specification - `_. + `_. * The `font.*` rcParams now affect only text objects created after the rcParam has been set, and will not retroactively affect already diff --git a/doc/conf.py b/doc/conf.py index 1a8782c6f4e7..2dfe950a1d9d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -163,7 +163,7 @@ # Github extension -github_project_url = "http://github.com/matplotlib/matplotlib/" +github_project_url = "https://github.com/matplotlib/matplotlib/" # Options for HTML output # ----------------------- diff --git a/doc/devel/MEP/MEP12.rst b/doc/devel/MEP/MEP12.rst index 61592ab127dc..380f4ab27931 100644 --- a/doc/devel/MEP/MEP12.rst +++ b/doc/devel/MEP/MEP12.rst @@ -87,8 +87,8 @@ the gallery would remain in those directories until they are cleaned up. After clean-up, they would be moved to one of the new gallery sections described above. "Clean-up" should involve: -* `sphinx-gallery docstrings `_: a - title and a description of the example formatted as follows, at the top of +* `sphinx-gallery docstrings `_: + a title and a description of the example formatted as follows, at the top of the example:: """ @@ -197,5 +197,5 @@ navigate the gallery. Thus, tags are complementary to this reorganization. .. [1] https://github.com/matplotlib/matplotlib/pull/714 .. [2] https://github.com/matplotlib/matplotlib/issues/524 .. [3] http://matplotlib.1069221.n5.nabble.com/Matplotlib-gallery-td762.html#a33379091 -.. [4] http://www.loria.fr/~rougier/teaching/matplotlib/ -.. [5] http://www.loria.fr/~rougier/coding/gallery/ +.. [4] http://www.labri.fr/perso/nrougier/teaching/matplotlib/ +.. [5] http://www.labri.fr/perso/nrougier/coding/gallery/ diff --git a/doc/devel/MEP/MEP13.rst b/doc/devel/MEP/MEP13.rst index 3200a1b742cb..518e9851e9c3 100644 --- a/doc/devel/MEP/MEP13.rst +++ b/doc/devel/MEP/MEP13.rst @@ -20,7 +20,7 @@ Abstract Wrap all of the matplotlib getter and setter methods with python `properties -`_, allowing +`_, allowing them to be read and written like class attributes. Detailed description diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst index 9542b6885fef..c5d129a7eb35 100644 --- a/doc/devel/MEP/MEP14.rst +++ b/doc/devel/MEP/MEP14.rst @@ -74,20 +74,20 @@ Supporting these things is difficult, and is the "full-time job" of a number of other projects: - `pango `_/`harfbuzz - `_ + `_ + `_ - `Microsoft DirectWrite - `_ + `_ - `Apple Core Text - `_ + `_ Of the above options, it should be noted that `harfbuzz` is designed from the start as a cross platform option with minimal dependencies, so therefore is a good candidate for a single option to support. Additionally, for supporting rich text, we could consider using -`WebKit `_, and possibly whether than +`WebKit `_, and possibly whether than represents a good single cross-platform option. Again, however, rich text formatting is outside of the scope of this project. @@ -133,7 +133,7 @@ which matches fonts using our own algorithm based on the `CSS font matching algorithm `_. It doesn't always do the same thing as the native font selection algorithms on Linux (`fontconfig -`_), Mac and +`_), Mac and Windows, and it doesn't always find all of the fonts on the system that the OS would normally pick up. However, it is cross-platform, and always finds the fonts that ship with matplotlib. The Cairo and @@ -152,7 +152,7 @@ lookup mechanism must only match against those fonts. It is unclear whether the OS-native font lookup systems can handle this case. There is also experimental support for using `fontconfig -`_ for font +`_ for font selection in matplotlib, turned off by default. fontconfig is the native font selection algorithm on Linux, but is also cross platform and works well on the other platforms (though obviously is an diff --git a/doc/devel/MEP/MEP25.rst b/doc/devel/MEP/MEP25.rst index 0c41348a7586..ee0e97e9f293 100644 --- a/doc/devel/MEP/MEP25.rst +++ b/doc/devel/MEP/MEP25.rst @@ -126,7 +126,7 @@ Implementation * A simple NB demonstrating some functionality for ``Line2DController`` objects: - http://nbviewer.ipython.org/gist/theengineear/f0aa8d79f64325e767c0 + http://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0 2. Write in protocols for the ``Controller`` to *update* the model. diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst index 761fbbd87f53..025b2b199953 100644 --- a/doc/devel/contributing.rst +++ b/doc/devel/contributing.rst @@ -32,11 +32,11 @@ You can check out the latest sources with the command:: After obtaining a local copy of the matplotlib source code (:ref:`set-up-fork`), navigate to the matplotlib directory and run the following in the shell:: - + python setup.py develop or:: - + pip install -v -e . @@ -50,10 +50,10 @@ symbolic links back to the source code). .. note:: - + If you decide to do install with ``python setup.py develop`` or ``pip install -v -e``, you will have to rerun:: - + python setup.py build every time the source code of a compiled extension is changed (for @@ -88,7 +88,7 @@ When working on bleeding edge packages, setting up a environment `_ is recommended. .. seealso:: - + * :ref:`testing` @@ -137,7 +137,7 @@ You may want to consider sending an email to the mailing list for more visibility. .. seealso:: - + * `Git documentation `_ * :ref:`development-workflow`. * :ref:`using-git` @@ -196,12 +196,12 @@ tools: * Code with a good unittest coverage (at least 70%, better 100%), check with:: - + pip install coverage python tests.py --with-coverage * No pyflakes warnings, check with:: - + pip install pyflakes pyflakes path/to/module.py @@ -227,10 +227,10 @@ Issues for New Contributors --------------------------- New contributors should look for the following tags when looking for issues. -We strongly recommend that new contributors tackle +We strongly recommend that new contributors tackle `new-contributor-friendly `_ issues (easy, well documented issues, that do not require an understanding of -the different submodules of matplotlib) and +the different submodules of matplotlib) and `Easy-fix `_ issues. This helps the contributor become familiar with the contribution workflow, and for the core devs to become acquainted with the contributor; diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst index b6ca7ffc5e89..96c46fd7f487 100644 --- a/doc/devel/documenting_mpl.rst +++ b/doc/devel/documenting_mpl.rst @@ -255,10 +255,10 @@ working with Sphinx in general. Here are a few additional things to keep in mind * The autodoc extension will handle index entries for the API, but additional entries in the index_ need to be explicitly added. -.. _Sphinx: http://sphinx.pocoo.org -.. _documentation: http://sphinx.pocoo.org/contents.html -.. _`inline markup`: http://sphinx.pocoo.org/markup/inline.html -.. _index: http://sphinx.pocoo.org/markup/para.html#index-generating-markup +.. _Sphinx: http://www.sphinx-doc.org +.. _documentation: http://www.sphinx-doc.org/contents.html +.. _`inline markup`: http://sphinx-doc.org/markup/inline.html +.. _index: http://sphinx-doc.org/markup/para.html#index-generating-markup * Please limit the text width of docstrings to 70 characters. diff --git a/doc/devel/gitwash/git_install.rst b/doc/devel/gitwash/git_install.rst index aa421d614364..06f64c35c261 100644 --- a/doc/devel/gitwash/git_install.rst +++ b/doc/devel/gitwash/git_install.rst @@ -21,6 +21,6 @@ See the git_ page for the most recent information. Have a look at the github_ install help pages available from `github help`_ -There are good instructions here: http://git-scm.com/book/en/v2/Getting-Started-Installing-Git +There are good instructions here: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git .. include:: links.inc diff --git a/doc/devel/gitwash/git_links.inc b/doc/devel/gitwash/git_links.inc index 1411625ad9da..a8beb0636574 100644 --- a/doc/devel/gitwash/git_links.inc +++ b/doc/devel/gitwash/git_links.inc @@ -13,9 +13,9 @@ .. _github: https://github.com .. _github help: https://help.github.com .. _msysgit: http://code.google.com/p/msysgit/downloads/list -.. _git-osx-installer: http://code.google.com/p/git-osx-installer/downloads/list +.. _git-osx-installer: https://code.google.com/archive/p/git-osx-installer/downloads .. _subversion: http://subversion.tigris.org/ -.. _git cheat sheet: https://github.com/guides/git-cheat-sheet +.. _git cheat sheet: http://cheat.errtheblog.com/s/git .. _pro git book: http://progit.org/ .. _git svn crash course: https://git-scm.com/course/svn.html .. _learn.github: http://learn.github.com/ @@ -27,25 +27,25 @@ .. _git casts: http://www.gitcasts.com/ .. _Fernando's git page: http://www.fperez.org/py4science/git.html .. _git magic: http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html -.. _git concepts: http://www.eecs.harvard.edu/~cduan/technical/git/ -.. _git clone: http://schacon.github.com/git/git-clone.html -.. _git checkout: http://schacon.github.com/git/git-checkout.html -.. _git commit: http://schacon.github.com/git/git-commit.html -.. _git push: http://schacon.github.com/git/git-push.html -.. _git pull: http://schacon.github.com/git/git-pull.html -.. _git add: http://schacon.github.com/git/git-add.html -.. _git status: http://schacon.github.com/git/git-status.html -.. _git diff: http://schacon.github.com/git/git-diff.html -.. _git log: http://schacon.github.com/git/git-log.html -.. _git branch: http://schacon.github.com/git/git-branch.html -.. _git remote: http://schacon.github.com/git/git-remote.html -.. _git config: http://schacon.github.com/git/git-config.html -.. _why the -a flag?: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html -.. _git staging area: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html -.. _tangled working copy problem: http://tomayko.com/writings/the-thing-about-git +.. _git concepts: https://www.sbf5.com/~cduan/technical/git/ +.. _git clone: http://schacon.github.io/git/git-clone.html +.. _git checkout: http://schacon.github.io/git/git-checkout.html +.. _git commit: http://schacon.github.io/git/git-commit.html +.. _git push: http://schacon.github.io/git/git-push.html +.. _git pull: http://schacon.github.io/git/git-pull.html +.. _git add: http://schacon.github.io/git/git-add.html +.. _git status: http://schacon.github.io/git/git-status.html +.. _git diff: http://schacon.github.io/git/git-diff.html +.. _git log: http://schacon.github.io/git/git-log.html +.. _git branch: http://schacon.github.io/git/git-branch.html +.. _git remote: http://schacon.github.io/git/git-remote.html +.. _git config: http://schacon.github.io/git/git-config.html +.. _why the -a flag?: http://gitready.com/beginner/2009/01/18/the-staging-area.html +.. _git staging area: http://gitready.com/beginner/2009/01/18/the-staging-area.html +.. _tangled working copy problem: http://2ndscale.com/rtomayko/2008/the-thing-about-git .. _linux git workflow: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html .. _git parable: http://tom.preston-werner.com/2009/05/19/the-git-parable.html -.. _git foundation: http://matthew-brett.github.com/pydagogue/foundation.html +.. _git foundation: http://matthew-brett.github.io/pydagogue/foundation.html .. other stuff .. _python: http://www.python.org diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst index 3e1e22cab8d5..565cba09b8ec 100644 --- a/doc/devel/testing.rst +++ b/doc/devel/testing.rst @@ -26,7 +26,7 @@ The following software is required to run the tests: Optionally you can install: - - `coverage `_ to collect coverage + - `coverage `_ to collect coverage information - `pep8 `_ to test coding standards @@ -254,7 +254,7 @@ If you want to enable Travis CI for your personal matplotlib GitHub repo, simply enable the repo to use Travis CI in either the Travis CI UI or the GitHub UI (Admin | Service Hooks). For details, see `the Travis CI Getting Started page -`_. This +`_. This generally isn't necessary, since any pull request submitted against the main matplotlib repository will be tested. diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 05fea10e0e0b..9a5e409ce151 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -591,7 +591,7 @@ for it in the :ref:`users-guide-index`. Bundle matplotlib in a `py2exe `_ app? ... I think you get the idea. matplotlib is documented using the `sphinx -`_ extensions to restructured text +`_ extensions to restructured text `(ReST) `_. sphinx is an extensible python framework for documentation projects which generates HTML and PDF, and is pretty easy to write; you can see the source for this diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index fefa86b8f129..95d1ed275b9e 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -172,10 +172,10 @@ excellent Python scientific software collections that are now available: - Anaconda_ from `Continuum Analytics`_ - Canopy_ from Enthought_ -.. _Canopy: https://enthought.com/products/canopy/ -.. _Anaconda: https://store.continuum.io/cshop/anaconda/ -.. _Enthought: http://enthought.com -.. _Continuum Analytics: http://continuum.io +.. _Canopy: https://www.enthought.com/products/canopy/ +.. _Anaconda: https://www.continuum.io/downloads +.. _Enthought: https://www.enthought.com +.. _Continuum Analytics: https://www.continuum.io These collections include Python itself and a wide range of libraries; if you need a library that is not available from the collection, you can install it @@ -205,7 +205,7 @@ Python.org Python ^^^^^^^^^^^^^^^^^ Install pip following the `standard pip install instructions -`_. For the impatient, +`_. For the impatient, open a new Terminal.app window and:: curl -O https://bootstrap.pypa.io/get-pip.py diff --git a/doc/faq/osx_framework.rst b/doc/faq/osx_framework.rst index b1cdb2719b39..c8f11a95b95c 100644 --- a/doc/faq/osx_framework.rst +++ b/doc/faq/osx_framework.rst @@ -18,7 +18,7 @@ framework build. In order to interact correctly with OSX through the native GUI frameworks you need a framework build of Python. At the time of writing the ``macosx`` and ``WXAgg`` backends require a framework build to function correctly. This can result in issues for -a python installation not build as a framework and may also happen in +a python installation not build as a framework and may also happen in virtual envs and when using (Ana)Conda. From Matplotlib 1.5 onwards the ``macosx`` backend checks that a framework build is available and fails if a non framework @@ -26,7 +26,7 @@ build is found. WX has a similar check build in. Without this check a partially functional figure is created. Among the issues with it is that it is produced in the background and -cannot be put in front of any other window. Several solutions and work +cannot be put in front of any other window. Several solutions and work arounds exist see below. Short version @@ -35,7 +35,7 @@ Short version VirtualEnv ---------- -If you are on Python 3, use +If you are on Python 3, use `venv `_ instead of `virtualenv `_:: diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst index e2b5111dff49..11b0989ee195 100644 --- a/doc/faq/troubleshooting_faq.rst +++ b/doc/faq/troubleshooting_faq.rst @@ -47,18 +47,18 @@ locate your :file:`matplotlib/` configuration directory, use '/home/darren/.config/matplotlib' On unix-like systems, this directory is generally located in your -:envvar:`HOME` directory under the :file:`.config/` directory. +:envvar:`HOME` directory under the :file:`.config/` directory. -In addition, users have a cache directory. On unix-like systems, this is -separate from the configuration directory by default. To locate your +In addition, users have a cache directory. On unix-like systems, this is +separate from the configuration directory by default. To locate your :file:`.cache/` directory, use :func:`matplotlib.get_cachedir`:: >>> import matplotlib as mpl >>> mpl.get_cachedir() '/home/darren/.cache/matplotlib' - -On windows, both the config directory and the cache directory are -the same and are in your :file:`Documents and Settings` or :file:`Users` + +On windows, both the config directory and the cache directory are +the same and are in your :file:`Documents and Settings` or :file:`Users` directory by default:: >>> import matplotlib @@ -104,7 +104,7 @@ please provide the following information in your e-mail to the packages, github, PyPi, or Anaconda_ or `Enthought Canopy `_). -.. _Anaconda: https://store.continuum.io/cshop/anaconda/ +.. _Anaconda: https://www.continuum.io/downloads * any customizations to your ``matplotlibrc`` file (see diff --git a/doc/faq/usage_faq.rst b/doc/faq/usage_faq.rst index 33d523381361..fd240d8ca801 100644 --- a/doc/faq/usage_faq.rst +++ b/doc/faq/usage_faq.rst @@ -447,7 +447,7 @@ macosx Cocoa rendering in OSX windows .. _`Cairo graphics`: https://en.wikipedia.org/wiki/Cairo_(graphics) .. _`Gimp Drawing Kit`: https://en.wikipedia.org/wiki/GDK .. _PyGTK: http://www.pygtk.org -.. _PyGObject: https://live.gnome.org/PyGObject +.. _PyGObject: https://wiki.gnome.org/action/show/Projects/PyGObject .. _pycairo: https://www.cairographics.org/pycairo/ .. _cairocffi: https://pythonhosted.org/cairocffi/ .. _wxPython: https://www.wxpython.org/ @@ -463,7 +463,7 @@ does not support python3. A work in progress redesigned version known as wxPython-Phoenix_ does support python3. Matplotlib should work with both versions. -.. _wxPython-Phoenix: http://wxpython.org/Phoenix/docs/html/main.html +.. _wxPython-Phoenix: https://wxpython.org/Phoenix/docs/html/main.html GTK and Cairo ============= @@ -523,8 +523,8 @@ and turned off via :func:`matplotlib.pyplot.ioff`. .. note:: Interactive mode works with suitable backends in ipython and in - the ordinary python shell, but it does *not* work in the IDLE IDE. - If the default backend does not support interactivity, an interactive + the ordinary python shell, but it does *not* work in the IDLE IDE. + If the default backend does not support interactivity, an interactive backend can be explicitly activated using any of the methods discussed in `What is a backend?`_. diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst index b694132c19d6..402918554474 100644 --- a/doc/glossary/index.rst +++ b/doc/glossary/index.rst @@ -40,7 +40,7 @@ Glossary file format for photographic images numpy - `numpy `_ is the standard numerical + `numpy `_ is the standard numerical array library for python, the successor to Numeric and numarray. numpy provides fast operations for homogeneous data sets and common mathematical operations like correlations, standard diff --git a/doc/resources/index.rst b/doc/resources/index.rst index 3631fd1abec2..73270d7bfa7d 100644 --- a/doc/resources/index.rst +++ b/doc/resources/index.rst @@ -18,7 +18,7 @@ by Benjamin Root * `Matplotlib for Python Developers - `_ + `_ by Sandro Tosi * `Matplotlib chapter `_ @@ -26,7 +26,7 @@ Applications * `Graphics with Matplotlib - `_ + `_ by David J. Raymond * `Ten Simple Rules for Better Figures @@ -46,7 +46,7 @@ * `Anatomy of Matplotlib `_ by Benjamin Root - + * `Data Visualization Basics with Python (O'Reilly) `_ by Randal S. Olson diff --git a/doc/thirdpartypackages/index.rst b/doc/thirdpartypackages/index.rst index 011b4c082973..a08869b61ac7 100644 --- a/doc/thirdpartypackages/index.rst +++ b/doc/thirdpartypackages/index.rst @@ -27,7 +27,7 @@ matplotlib plots. seaborn ======= -`seaborn `_ is a high level interface for drawing +`seaborn `_ is a high level interface for drawing statistical graphics with matplotlib. It aims to make visualization a central part of exploring and understanding complex datasets. diff --git a/doc/users/credits.rst b/doc/users/credits.rst index 611defd97c66..7afc54a89c17 100644 --- a/doc/users/credits.rst +++ b/doc/users/credits.rst @@ -7,7 +7,7 @@ Credits matplotlib was written by John Hunter and is now developed and maintained by a number of `active -`_ developers. +`_ developers. The current co-lead developers of matplotlib are Michael Droettboom and Thomas A. Caswell. diff --git a/doc/users/event_handling.rst b/doc/users/event_handling.rst index 21c474bb648e..652e07937bb8 100644 --- a/doc/users/event_handling.rst +++ b/doc/users/event_handling.rst @@ -240,8 +240,8 @@ Here is the solution:: **Extra credit**: use the animation blit techniques discussed in the `animations recipe -`_ to make the -animated drawing faster and smoother. +`_ to +make the animated drawing faster and smoother. Extra credit solution:: diff --git a/doc/users/image_tutorial.rst b/doc/users/image_tutorial.rst index 14cf3dc9cb43..dd0e76d2ceb1 100644 --- a/doc/users/image_tutorial.rst +++ b/doc/users/image_tutorial.rst @@ -108,7 +108,7 @@ data. Why 8 bits? Most displays can only render 8 bits per channel worth of color gradation. Why can they only render 8 bits/channel? Because that's about all the human eye can see. More here (from a photography standpoint): `Luminous Landscape bit depth tutorial -`_. +`_. Each inner list represents a pixel. Here, with an RGB image, there are 3 values. Since it's a black and white image, R, G, and B are all @@ -164,7 +164,7 @@ channel of our data: In [7]: lum_img = img[:,:,0] This is array slicing. You can read more in the `Numpy tutorial -`_. +`_. .. sourcecode:: ipython @@ -217,13 +217,13 @@ Note that you can also change colormaps on existing plot objects using the .. note:: - However, remember that in the IPython notebook with the inline backend, + However, remember that in the IPython notebook with the inline backend, you can't make changes to plots that have already been rendered. If you create imgplot here in one cell, you cannot call set_cmap() on it in a later - cell and expect the earlier plot to change. Make sure that you enter these - commands together in one cell. plt commands will not change plots from earlier + cell and expect the earlier plot to change. Make sure that you enter these + commands together in one cell. plt commands will not change plots from earlier cells. - + There are many other colormap schemes available. See the `list and images of the colormaps <../examples/color/colormaps_reference.html>`_. @@ -333,7 +333,7 @@ only keeping a select few. Now when we plot it, that data gets blown up to the size on your screen. The old pixels aren't there anymore, and the computer has to draw in pixels to fill that space. -We'll use the Pillow library that we used to load the image also to resize +We'll use the Pillow library that we used to load the image also to resize the image. .. sourcecode:: ipython diff --git a/doc/users/intro.rst b/doc/users/intro.rst index ef05a547831c..fa54837d59f2 100644 --- a/doc/users/intro.rst +++ b/doc/users/intro.rst @@ -78,7 +78,7 @@ library that ships with matplotlib, GTK embeds matplotlib in a `Gtk+ `_ application, GTKAgg uses the Anti-Grain renderer to create a figure and embed it in a Gtk+ application, and so on for `PDF -`_, `WxWidgets +`_, `WxWidgets `_, `Tkinter `_, etc. diff --git a/doc/users/license.rst b/doc/users/license.rst index 72c2f84c060b..4dcb0798712f 100644 --- a/doc/users/license.rst +++ b/doc/users/license.rst @@ -6,7 +6,7 @@ License Matplotlib only uses BSD compatible code, and its license is based on -the `PSF `_ license. See the Open +the `PSF `_ license. See the Open Source Initiative `licenses page `_ for details on individual licenses. Non-BSD compatible licenses (e.g., LGPL) are acceptable in diff --git a/doc/users/pgf.rst b/doc/users/pgf.rst index 3d30967a3bd1..041ff8cf5553 100644 --- a/doc/users/pgf.rst +++ b/doc/users/pgf.rst @@ -160,17 +160,17 @@ Troubleshooting in yout LaTeX document, the alignment of text elements in imported figures may be off. Check the header of your ``.pgf`` file if you are unsure about the fonts matplotlib used for the layout. - -* Vector images and hence ``.pgf`` files can become bloated if there are a lot + +* Vector images and hence ``.pgf`` files can become bloated if there are a lot of objects in the graph. This can be the case for image processing or very - big scatter graphs. In an extreme case this can cause TeX to run out of - memory: "TeX capacity exceeded, sorry" You can configure latex to increase - the amount of memory available to generate the ``.pdf`` image as discussed on + big scatter graphs. In an extreme case this can cause TeX to run out of + memory: "TeX capacity exceeded, sorry" You can configure latex to increase + the amount of memory available to generate the ``.pdf`` image as discussed on `tex.stackexchange.com `_. - Another way would be to "rasterize" parts of the graph causing problems - using either the ``rasterized=True`` keyword, or ``.set_rasterized(True)`` as per + Another way would be to "rasterize" parts of the graph causing problems + using either the ``rasterized=True`` keyword, or ``.set_rasterized(True)`` as per `this example `_. - + * If you still need help, please see :ref:`reporting-problems` .. _LaTeX: http://www.tug.org diff --git a/doc/users/pyplot_tutorial.rst b/doc/users/pyplot_tutorial.rst index dfcdcf9b6b38..96d31dafaf7e 100644 --- a/doc/users/pyplot_tutorial.rst +++ b/doc/users/pyplot_tutorial.rst @@ -52,7 +52,7 @@ axes. If matplotlib were limited to working with lists, it would be fairly useless for numeric processing. Generally, you will use `numpy -`_ arrays. In fact, all sequences are +`_ arrays. In fact, all sequences are converted to numpy arrays internally. The example below illustrates a plotting several lines with different format styles in one command using arrays. diff --git a/doc/users/shell.rst b/doc/users/shell.rst index 3581fcccbe1e..82822842e763 100644 --- a/doc/users/shell.rst +++ b/doc/users/shell.rst @@ -73,7 +73,7 @@ run so you can continue tweaking the figure manually. There has been a lot of recent work to embed ipython, with pylab support, into various GUI applications, so check on the ipython mailing `list -`_ for the +`_ for the latest status. .. _other-shells: diff --git a/doc/users/text_intro.rst b/doc/users/text_intro.rst index 5c1da5d9ebfb..1075b0d58fed 100644 --- a/doc/users/text_intro.rst +++ b/doc/users/text_intro.rst @@ -9,7 +9,7 @@ vector outputs, newline separated text with arbitrary rotations, and unicode support. Because it embeds fonts directly in output documents, e.g., for postscript or PDF, what you see on the screen is what you get in the hardcopy. -`FreeType `_ support +`FreeType `_ support produces very nice, antialiased fonts, that look good even at small raster sizes. matplotlib includes its own :mod:`matplotlib.font_manager` (thanks to Paul Barrett), which diff --git a/doc/users/transforms_tutorial.rst b/doc/users/transforms_tutorial.rst index 269f54aa95a8..fc3e574f190a 100644 --- a/doc/users/transforms_tutorial.rst +++ b/doc/users/transforms_tutorial.rst @@ -453,4 +453,3 @@ see how to make your own, since matplotlib supports extensible axes and projections. Michael Droettboom has provided a nice tutorial example of creating a hammer projection axes; see :ref:`api-custom_projection_example`. - diff --git a/doc/users/usetex.rst b/doc/users/usetex.rst index 2b9157a2534b..ee310efe133f 100644 --- a/doc/users/usetex.rst +++ b/doc/users/usetex.rst @@ -152,7 +152,7 @@ Troubleshooting .. _LaTeX: http://www.tug.org .. _dvipng: http://www.nongnu.org/dvipng/ -.. _Ghostscript: http://www.cs.wisc.edu/~ghost/ +.. _Ghostscript: http://pages.cs.wisc.edu/~ghost/ .. _PSNFSS: http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf .. _Poppler: https://poppler.freedesktop.org/ .. _Xpdf: http://www.foolabs.com/xpdf diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index 47efd9795319..b19d20b4edb0 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -674,7 +674,7 @@ class is even handier, and prettier to use. Whenever you want to >>> point.datum By: Alex Martelli - From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52308 + From: http://code.activestate.com/recipes/121294/ """ def __init__(self, **kwds): self.__dict__.update(kwds) @@ -869,7 +869,7 @@ def flatten(seq, scalarp=is_scalar_or_string): ['John', 'Hunter', 1, 23, 42, 5, 23] By: Composite of Holger Krekel and Luther Blissett - From: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/121294 + From: http://code.activestate.com/recipes/121294/ and Recipe 1.12 in cookbook """ for item in seq: @@ -2636,7 +2636,7 @@ class Locked(object): Based on code from conda. - (c) 2012-2013 Continuum Analytics, Inc. / http://continuum.io + (c) 2012-2013 Continuum Analytics, Inc. / https://www.continuum.io/ All Rights Reserved conda is distributed under the terms of the BSD 3-clause license. diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py index 7783b783046b..2ce115833a90 100644 --- a/lib/matplotlib/dates.py +++ b/lib/matplotlib/dates.py @@ -39,7 +39,7 @@ locators you create. See `pytz `_ for information on :mod:`pytz` and timezone handling. -The `dateutil module `_ provides +The `dateutil module `_ provides additional code to handle date ticking, making it easy to place ticks on any kinds of dates. See examples below. @@ -87,7 +87,7 @@ :class:`matplotlib.dates.rrulewrapper`. The :class:`rrulewrapper` is a simple wrapper around a :class:`dateutil.rrule` (`dateutil - `_) which allow almost + `_) which allow almost arbitrary date tick specifications. See `rrule example <../examples/pylab_examples/date_demo_rrule.html>`_. diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py index 284f9109aedc..5ba6fdf88071 100644 --- a/lib/matplotlib/font_manager.py +++ b/lib/matplotlib/font_manager.py @@ -653,10 +653,10 @@ class FontProperties(object): on the font manager's default font size. This class will also accept a `fontconfig - `_ pattern, if it is the only argument - provided. See the documentation on `fontconfig patterns - `_. This support - does not require fontconfig to be installed. We are merely + `_ pattern, if it is + the only argument provided. See the documentation on `fontconfig patterns + `_. + This support does not require fontconfig to be installed. We are merely borrowing its pattern syntax for use here. Note that matplotlib's internal font manager and fontconfig use a @@ -796,7 +796,7 @@ def get_fontconfig_pattern(self): specified with fontconfig's ``fc-match`` utility. See the documentation on `fontconfig patterns - `_. + `_. This support does not require fontconfig to be installed or support for it to be enabled. We are merely borrowing its @@ -909,7 +909,7 @@ def set_fontconfig_pattern(self, pattern): Set the properties by parsing a fontconfig *pattern*. See the documentation on `fontconfig patterns - `_. + `_. This support does not require fontconfig to be installed or support for it to be enabled. We are merely borrowing its diff --git a/lib/matplotlib/fontconfig_pattern.py b/lib/matplotlib/fontconfig_pattern.py index 2b1358c86bc9..058e824d95cb 100644 --- a/lib/matplotlib/fontconfig_pattern.py +++ b/lib/matplotlib/fontconfig_pattern.py @@ -2,8 +2,8 @@ A module for parsing and generating fontconfig patterns. See the `fontconfig pattern specification -`_ for more -information. +`_ for +more information. """ # This class is defined here because it must be available in: @@ -37,8 +37,8 @@ class FontconfigPatternParser(object): """A simple pyparsing-based parser for fontconfig-style patterns. See the `fontconfig pattern specification - `_ for more - information. + `_ + for more information. """ _constants = { diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index 02d1df4b5869..388e1a20b3b8 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -1355,7 +1355,7 @@ def thumbnail(infile, thumbfile, scale=0.1, interpolation='bilinear', *thumbfile*. *infile* the image file -- must be PNG or Pillow-readable if you - have `Pillow `_ installed + have `Pillow `_ installed *thumbfile* the thumbnail filename diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py index 0deb5b3545f7..fcc31e62bcad 100644 --- a/lib/matplotlib/mlab.py +++ b/lib/matplotlib/mlab.py @@ -1921,7 +1921,7 @@ def dist_point_to_segment(p, s0, s1): *p*, *s0*, *s1* are *xy* sequences This algorithm from - http://softsurfer.com/Archive/algorithm_0102/algorithm_0102.htm#Distance%20to%20Ray%20or%20Segment + http://geomalgorithms.com/a02-_lines.html """ p = np.asarray(p, float) s0 = np.asarray(s0, float) diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 161e10444345..0081f647c0f3 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -1960,7 +1960,7 @@ def colormaps(): ============ ======================================================= The following colormaps are based on the `ColorBrewer - `_ color specifications and designs developed by + `_ color specifications and designs developed by Cynthia Brewer: ColorBrewer Diverging (luminance is highest at the midpoint, and @@ -2076,7 +2076,7 @@ def colormaps(): .. [#] Rainbow colormaps, ``jet`` in particular, are considered a poor choice for scientific visualization by many researchers: `Rainbow Color Map (Still) Considered Harmful - `_ + `_ .. [#] Resembles "BkBlAqGrYeOrReViWh200" from NCAR Command Language. See `Color Table Gallery diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py index 26b90ca66643..79153966be27 100644 --- a/lib/matplotlib/stackplot.py +++ b/lib/matplotlib/stackplot.py @@ -39,7 +39,7 @@ def stackplot(axes, x, *args, **kwargs): sum of the squared slopes. 'weighted_wiggle' does the same but weights to account for size of each layer. It is also called `Streamgraph`-layout. More details - can be found at http://www.leebyron.com/else/streamgraph/. + can be found at http://leebyron.com/streamgraph/. *labels* : A list or tuple of labels to assign to each data series. From 567d03a8f2c35a9047caf70ee7f84056fa58cd26 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 27 Dec 2016 22:56:20 +0000 Subject: [PATCH 3/5] Catch last few redirect links --- INSTALL | 29 +++++++++++++++-------------- doc/devel/MEP/MEP14.rst | 2 +- doc/glossary/index.rst | 18 +++++++++--------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/INSTALL b/INSTALL index 6c2eebb1e825..d4009c76c68e 100644 --- a/INSTALL +++ b/INSTALL @@ -57,7 +57,7 @@ one of the `scipy-stack compatible Python distributions Enthought Canopy, or Continuum Anaconda, which have matplotlib and many of its dependencies, plus other useful packages, preinstalled. -For `standard Python `_ installations, +For `standard Python `_ installations, install matplotlib using pip_:: python -m pip install -U pip setuptools @@ -65,9 +65,9 @@ install matplotlib using pip_:: In case Python 2.7 or 3.4 are not installed for all users, the Microsoft Visual C++ 2008 ( -`64 bit `__ +`64 bit `__ or -`32 bit `__ +`32 bit `__ for Python 2.7) or Microsoft Visual C++ 2010 ( `64 bit `__ or @@ -76,12 +76,12 @@ for Python 3.4) redistributable packages need to be installed. Matplotlib depends on `Pillow `_ for reading and saving JPEG, BMP, and TIFF image files. -Matplotlib requires `MiKTeX `_ and -`GhostScript `_ for rendering text +Matplotlib requires `MiKTeX `_ and +`GhostScript `_ for rendering text with LaTeX. `FFmpeg `_, `avconv `_, `mencoder `_, or -`ImageMagick `_ are required for the +`ImageMagick `_ are required for the animation module. The following backends should work out of the box: agg, tkagg, ps, @@ -146,7 +146,7 @@ python, numpy, libpng and freetype), you can build matplotlib:: python setup.py install We provide a `setup.cfg -`_ +`_ file that goes with :file:`setup.py` which you can use to customize the build process. For example, which default backend to use, whether some of the optional libraries that matplotlib ships with are @@ -178,10 +178,10 @@ Required Dependencies ^^^^^^^^^^^^^^^^^^^^^ :term:`python` 2.7, 3.4, 3.5 or 3.6 - `Download python `_. + `Download python `_. :term:`numpy` |minimum_numpy_version| (or later) - array support for python (`download numpy `_) + array support for python (`download numpy `_) `setuptools `__ Setuptools provides extensions for python package installation. @@ -202,7 +202,8 @@ Required Dependencies zlib. `pytz `__ - Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz + Used to manipulate time-zone aware datetimes. + https://pypi.python.org/pypi/pytz :term:`FreeType` 2.3 or later Library for reading true type font files. If using pip, easy_install or @@ -259,17 +260,17 @@ Optional external programs Required for the animation module to be save out put to movie formats. -`ImageMagick `__ +`ImageMagick `__ Required for the animation module to be able to save to animated gif. Optional dependencies ^^^^^^^^^^^^^^^^^^^^^ -`Pillow `__ +`Pillow `__ If Pillow is installed, matplotlib can read and write a larger selection of image file formats. -`pkg-config `__ +`pkg-config `__ A tool used to find required non-python libraries. This is not strictly required, but can make installation go more smoothly if the libraries and headers are not in the expected locations. @@ -329,7 +330,7 @@ git repository and follow the instruction in :file:`README.osx`. Building on Windows ------------------- -The Python shipped from http://www.python.org is compiled with Visual Studio +The Python shipped from https://www.python.org is compiled with Visual Studio 2008 for versions before 3.3, Visual Studio 2010 for 3.3 and 3.4, and Visual Studio 2015 for 3.5 and 3.6. Python extensions are recommended to be compiled with the same compiler. diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst index c5d129a7eb35..b40a3f5e0f62 100644 --- a/doc/devel/MEP/MEP14.rst +++ b/doc/devel/MEP/MEP14.rst @@ -74,7 +74,7 @@ Supporting these things is difficult, and is the "full-time job" of a number of other projects: - `pango `_/`harfbuzz - `_ - `QtTextLayout `_ - `Microsoft DirectWrite diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst index 402918554474..215b1cbb5bf7 100644 --- a/doc/glossary/index.rst +++ b/doc/glossary/index.rst @@ -20,7 +20,7 @@ Glossary provides extensions to the standard datetime module EPS - Encapsulated Postscript (`EPS `_) + Encapsulated Postscript (`EPS `_) FreeType `FreeType `_ is a font rasterization @@ -36,7 +36,7 @@ Glossary JPG The Joint Photographic Experts Group (`JPEG - `_) compression method and + `_) compression method and file format for photographic images numpy @@ -47,17 +47,17 @@ Glossary deviation, fourier transforms, and convolutions. PDF - Adobe's Portable Document Format (`PDF `_) + Adobe's Portable Document Format (`PDF `_) PNG Portable Network Graphics (`PNG - `_), a raster graphics format + `_), a raster graphics format that employs lossless data compression which is more suitable for line art than the lossy jpg format. Unlike the gif format, png is not encumbered by requirements for a patent license. PS - Postscript (`PS `_) is a + Postscript (`PS `_) is a vector graphics ASCII text language widely used in printers and publishing. Postscript was developed by adobe systems and is starting to show its age: for example is does not have an alpha @@ -106,7 +106,7 @@ Glossary raster graphics `Raster graphics - `_, or bitmaps, + `_, or bitmaps, represent an image as an array of pixels which is resolution dependent. Raster graphics are generally most practical for photo-realistic images, but do not scale easily without loss of @@ -114,12 +114,12 @@ Glossary SVG The Scalable Vector Graphics format (`SVG - `_). An XML based vector + `_). An XML based vector graphics format supported by many web browsers. TIFF Tagged Image File Format (`TIFF - `_) is a + `_) is a file format for storing images, including photographs and line art. @@ -131,7 +131,7 @@ Glossary vector graphics `vector graphics - `_ use geometrical + `_ use geometrical primitives based upon mathematical equations to represent images in computer graphics. Primitives can include points, lines, curves, and shapes or polygons. Vector graphics are scalable, From 8eb34b21256996569df44b0cdce9768f2b010079 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 27 Dec 2016 22:59:34 +0000 Subject: [PATCH 4/5] Fix little link bug --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index d4009c76c68e..4716eb065092 100644 --- a/INSTALL +++ b/INSTALL @@ -67,7 +67,7 @@ In case Python 2.7 or 3.4 are not installed for all users, the Microsoft Visual C++ 2008 ( `64 bit `__ or -`32 bit `__ +`32 bit `__ for Python 2.7) or Microsoft Visual C++ 2010 ( `64 bit `__ or From 808d996bdcbf6ce31b550651dc5b5acca35df627 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 28 Dec 2016 12:35:30 +0000 Subject: [PATCH 5/5] Requested changes for link redirect fixes --- INSTALL | 8 ++++---- doc/devel/MEP/MEP13.rst | 2 +- doc/devel/MEP/MEP25.rst | 2 +- doc/devel/documenting_mpl.rst | 4 ++-- doc/devel/release_guide.rst | 2 +- doc/devel/testing.rst | 2 +- doc/faq/howto_faq.rst | 2 +- doc/faq/installing_faq.rst | 2 +- doc/glossary/index.rst | 18 +++++++++--------- doc/users/event_handling.rst | 2 +- doc/users/usetex.rst | 2 +- lib/matplotlib/cbook.py | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/INSTALL b/INSTALL index 4716eb065092..0a935d58583a 100644 --- a/INSTALL +++ b/INSTALL @@ -67,11 +67,11 @@ In case Python 2.7 or 3.4 are not installed for all users, the Microsoft Visual C++ 2008 ( `64 bit `__ or -`32 bit `__ +`32 bit `__ for Python 2.7) or Microsoft Visual C++ 2010 ( -`64 bit `__ +`64 bit `__ or -`32 bit `__ +`32 bit `__ for Python 3.4) redistributable packages need to be installed. Matplotlib depends on `Pillow `_ @@ -146,7 +146,7 @@ python, numpy, libpng and freetype), you can build matplotlib:: python setup.py install We provide a `setup.cfg -`_ +`_ file that goes with :file:`setup.py` which you can use to customize the build process. For example, which default backend to use, whether some of the optional libraries that matplotlib ships with are diff --git a/doc/devel/MEP/MEP13.rst b/doc/devel/MEP/MEP13.rst index 518e9851e9c3..db2f8b17772a 100644 --- a/doc/devel/MEP/MEP13.rst +++ b/doc/devel/MEP/MEP13.rst @@ -20,7 +20,7 @@ Abstract Wrap all of the matplotlib getter and setter methods with python `properties -`_, allowing +`_, allowing them to be read and written like class attributes. Detailed description diff --git a/doc/devel/MEP/MEP25.rst b/doc/devel/MEP/MEP25.rst index ee0e97e9f293..f4974bd3055f 100644 --- a/doc/devel/MEP/MEP25.rst +++ b/doc/devel/MEP/MEP25.rst @@ -126,7 +126,7 @@ Implementation * A simple NB demonstrating some functionality for ``Line2DController`` objects: - http://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0 + https://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0 2. Write in protocols for the ``Controller`` to *update* the model. diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst index 96c46fd7f487..c2cd95aef458 100644 --- a/doc/devel/documenting_mpl.rst +++ b/doc/devel/documenting_mpl.rst @@ -257,8 +257,8 @@ working with Sphinx in general. Here are a few additional things to keep in mind .. _Sphinx: http://www.sphinx-doc.org .. _documentation: http://www.sphinx-doc.org/contents.html -.. _`inline markup`: http://sphinx-doc.org/markup/inline.html -.. _index: http://sphinx-doc.org/markup/para.html#index-generating-markup +.. _`inline markup`: http://www.sphinx-doc.org/markup/inline.html +.. _index: http://www.sphinx-doc.org/markup/para.html#index-generating-markup * Please limit the text width of docstrings to 70 characters. diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst index d3ffbf9f8f97..5df2dbfdf3c6 100644 --- a/doc/devel/release_guide.rst +++ b/doc/devel/release_guide.rst @@ -100,7 +100,7 @@ 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 -`_. +`_. Then updating the record on PyPI is as simple as:: diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst index 565cba09b8ec..f08199810aa1 100644 --- a/doc/devel/testing.rst +++ b/doc/devel/testing.rst @@ -26,7 +26,7 @@ The following software is required to run the tests: Optionally you can install: - - `coverage `_ to collect coverage + - `coverage `_ to collect coverage information - `pep8 `_ to test coding standards diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst index 9a5e409ce151..2344800b6c7f 100644 --- a/doc/faq/howto_faq.rst +++ b/doc/faq/howto_faq.rst @@ -591,7 +591,7 @@ for it in the :ref:`users-guide-index`. Bundle matplotlib in a `py2exe `_ app? ... I think you get the idea. matplotlib is documented using the `sphinx -`_ extensions to restructured text +`_ extensions to restructured text `(ReST) `_. sphinx is an extensible python framework for documentation projects which generates HTML and PDF, and is pretty easy to write; you can see the source for this diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst index 95d1ed275b9e..c041d980b5e1 100644 --- a/doc/faq/installing_faq.rst +++ b/doc/faq/installing_faq.rst @@ -205,7 +205,7 @@ Python.org Python ^^^^^^^^^^^^^^^^^ Install pip following the `standard pip install instructions -`_. For the impatient, +`_. For the impatient, open a new Terminal.app window and:: curl -O https://bootstrap.pypa.io/get-pip.py diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst index 215b1cbb5bf7..a4713567726a 100644 --- a/doc/glossary/index.rst +++ b/doc/glossary/index.rst @@ -20,7 +20,7 @@ Glossary provides extensions to the standard datetime module EPS - Encapsulated Postscript (`EPS `_) + Encapsulated Postscript (`EPS `_) FreeType `FreeType `_ is a font rasterization @@ -36,7 +36,7 @@ Glossary JPG The Joint Photographic Experts Group (`JPEG - `_) compression method and + `_) compression method and file format for photographic images numpy @@ -47,17 +47,17 @@ Glossary deviation, fourier transforms, and convolutions. PDF - Adobe's Portable Document Format (`PDF `_) + Adobe's Portable Document Format (`PDF `_) PNG Portable Network Graphics (`PNG - `_), a raster graphics format + `_), a raster graphics format that employs lossless data compression which is more suitable for line art than the lossy jpg format. Unlike the gif format, png is not encumbered by requirements for a patent license. PS - Postscript (`PS `_) is a + Postscript (`PS `_) is a vector graphics ASCII text language widely used in printers and publishing. Postscript was developed by adobe systems and is starting to show its age: for example is does not have an alpha @@ -106,7 +106,7 @@ Glossary raster graphics `Raster graphics - `_, or bitmaps, + `_, or bitmaps, represent an image as an array of pixels which is resolution dependent. Raster graphics are generally most practical for photo-realistic images, but do not scale easily without loss of @@ -114,12 +114,12 @@ Glossary SVG The Scalable Vector Graphics format (`SVG - `_). An XML based vector + `_). An XML based vector graphics format supported by many web browsers. TIFF Tagged Image File Format (`TIFF - `_) is a + `_) is a file format for storing images, including photographs and line art. @@ -131,7 +131,7 @@ Glossary vector graphics `vector graphics - `_ use geometrical + `_ use geometrical primitives based upon mathematical equations to represent images in computer graphics. Primitives can include points, lines, curves, and shapes or polygons. Vector graphics are scalable, diff --git a/doc/users/event_handling.rst b/doc/users/event_handling.rst index 652e07937bb8..2310e93f8735 100644 --- a/doc/users/event_handling.rst +++ b/doc/users/event_handling.rst @@ -240,7 +240,7 @@ Here is the solution:: **Extra credit**: use the animation blit techniques discussed in the `animations recipe -`_ to +`_ to make the animated drawing faster and smoother. Extra credit solution:: diff --git a/doc/users/usetex.rst b/doc/users/usetex.rst index ee310efe133f..b094d572918b 100644 --- a/doc/users/usetex.rst +++ b/doc/users/usetex.rst @@ -152,7 +152,7 @@ Troubleshooting .. _LaTeX: http://www.tug.org .. _dvipng: http://www.nongnu.org/dvipng/ -.. _Ghostscript: http://pages.cs.wisc.edu/~ghost/ +.. _Ghostscript: https://ghostscript.com/ .. _PSNFSS: http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf .. _Poppler: https://poppler.freedesktop.org/ .. _Xpdf: http://www.foolabs.com/xpdf diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index b19d20b4edb0..41b31a825085 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -674,7 +674,7 @@ class is even handier, and prettier to use. Whenever you want to >>> point.datum By: Alex Martelli - From: http://code.activestate.com/recipes/121294/ + From: https://code.activestate.com/recipes/121294/ """ def __init__(self, **kwds): self.__dict__.update(kwds) @@ -869,7 +869,7 @@ def flatten(seq, scalarp=is_scalar_or_string): ['John', 'Hunter', 1, 23, 42, 5, 23] By: Composite of Holger Krekel and Luther Blissett - From: http://code.activestate.com/recipes/121294/ + From: https://code.activestate.com/recipes/121294/ and Recipe 1.12 in cookbook """ for item in seq: