From 1c7d15ed1212eb435d7a8901a744fae5d98b234b Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 10:34:14 -0500 Subject: [PATCH 01/13] replaces epd and pythonxy with anaconda and canopy. Also, added some notions in the readme.osx --- INSTALL | 22 +++++++++++----------- README.osx | 25 ++++++++++++++++++------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/INSTALL b/INSTALL index 8e165006da22..05cb37b9a591 100644 --- a/INSTALL +++ b/INSTALL @@ -11,17 +11,17 @@ depends on what operating system you are using, what you already have installed, and how you want to use it. To avoid wading through all the details (and potential complications) on this page, the easiest thing for you to do is use one of the pre-packaged python -distributions that already provide matplotlib built-in. The Enthought -Python Distribution `(EPD) -`_ for Windows, OS X or -Redhat is an excellent choice that "just works" out of the box. -Another excellent alternative for Windows users is `Python (x, y) -`_ which tends to be updated a bit more -frequently. Both of these packages include matplotlib and pylab, and -*lots* of other useful tools. matplotlib is also packaged for almost -every major Linux distribution. So if you are on Linux, your package -manager will probably provide matplotlib prebuilt. - +distributions that already provide matplotlib built-in. The +Continuum.io distribution `(Anaconda) +`_ or the Enthought distribution +`(Canopy) `_ for Windows, OS X, or +Redhat is an excellent choice that "just works" out of the box. Another +excellent alternative for Windows users is `Python (x, y) +`_ which tends to be updated a bit more frequently. +Both of these packages include matplotlib and pylab, and *lots* of other useful +tools. matplotlib is also packaged for almost every major Linux distribution. +So if you are on Linux, your package manager will probably provide matplotlib +prebuilt. Manually installing pre-built packages ====================================== diff --git a/README.osx b/README.osx index c2ca0a59afce..b12f8569b09d 100644 --- a/README.osx +++ b/README.osx @@ -1,11 +1,18 @@ -Building mpl on OSX has proven to be a nightmare because of all the +Building mpl on OSX is sometimes a nightmare because of all the different types of zlib, png and freetype that may be on your system. -The recommended and supported way to build is to use a third-party -package manager to install the required dependencies, and then -install matplotlib from source using the setup.py script. Two widely -used package managers are homebrew and MacPorts. The following -example illustrates how to install libpng and freetype using -homebrew. + +For developers who want to build matplotlib from source, the recommended and +supported way to build is to use a third-party package manager to install the +required dependencies, and then install matplotlib from source using the +setup.py script. Three widely used package managers are conda, homebrew, and +MacPorts. The following example illustrates how to install libpng and freetype +using conda: + +Example usage:: + + conda install libpng freetype + +If you are using homebrew, execute the following instead: Example usage:: @@ -22,3 +29,7 @@ To install matplotlib from source, execute: Example usage:: python setup.py install + + +Note that your environment is somewhat important. Some conda users have found +that their PYTHONPATH must include /path/to/anaconda/ From 96dc0f53b7247ef718ac16bcf15921e94f0e2d88 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 10:38:26 -0500 Subject: [PATCH 02/13] adds dyld_fallback_library_path --- README.osx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.osx b/README.osx index b12f8569b09d..0cf5a39f2dc2 100644 --- a/README.osx +++ b/README.osx @@ -31,5 +31,7 @@ Example usage:: python setup.py install -Note that your environment is somewhat important. Some conda users have found -that their PYTHONPATH must include /path/to/anaconda/ +Note that your environment is somewhat important. Some conda users have +found that their PYTHONPATH must include +/path/to/anaconda/.../site-packages and their DYLD_FALLBACK_LIBRARY_PATH +must include /path/to/anaconda/lib. From f6622a74030753a98f9bdb6acd40c8a9ee1d9279 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 10:41:18 -0500 Subject: [PATCH 03/13] removing pythonxy --- INSTALL | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 05cb37b9a591..4fe37bc82796 100644 --- a/INSTALL +++ b/INSTALL @@ -15,9 +15,7 @@ distributions that already provide matplotlib built-in. The Continuum.io distribution `(Anaconda) `_ or the Enthought distribution `(Canopy) `_ for Windows, OS X, or -Redhat is an excellent choice that "just works" out of the box. Another -excellent alternative for Windows users is `Python (x, y) -`_ which tends to be updated a bit more frequently. +Redhat is an excellent choice that "just works" out of the box. Both of these packages include matplotlib and pylab, and *lots* of other useful tools. matplotlib is also packaged for almost every major Linux distribution. So if you are on Linux, your package manager will probably provide matplotlib From 1cd889837e75b5990fbccea0e40704499a07a347 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 10:55:36 -0500 Subject: [PATCH 04/13] reformatting for line length --- INSTALL | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index 4fe37bc82796..6403037f6f1e 100644 --- a/INSTALL +++ b/INSTALL @@ -11,15 +11,16 @@ depends on what operating system you are using, what you already have installed, and how you want to use it. To avoid wading through all the details (and potential complications) on this page, the easiest thing for you to do is use one of the pre-packaged python -distributions that already provide matplotlib built-in. The -Continuum.io distribution `(Anaconda) -`_ or the Enthought distribution -`(Canopy) `_ for Windows, OS X, or -Redhat is an excellent choice that "just works" out of the box. -Both of these packages include matplotlib and pylab, and *lots* of other useful -tools. matplotlib is also packaged for almost every major Linux distribution. -So if you are on Linux, your package manager will probably provide matplotlib -prebuilt. +distributions that already provide matplotlib built-in. The Continuum.io +Python distribution `(Anaconda) +`_ for Windows, OS X, or Redhat +is an excellent choice that "just works" out of the box. +The Enthought distribution `(Canopy) +`_ is also a good a good choice +for any platform. Both of these packages include matplotlib and pylab, and +*lots* of other useful tools. matplotlib is also packaged for almost +every major Linux distribution. So if you are on Linux, your package +manager will probably provide matplotlib prebuilt. Manually installing pre-built packages ====================================== From 2b703d96d9176e96b5e67f60432b844121703868 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 11:05:25 -0500 Subject: [PATCH 05/13] redhat->linux --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 6403037f6f1e..45269af8c142 100644 --- a/INSTALL +++ b/INSTALL @@ -13,7 +13,7 @@ the details (and potential complications) on this page, the easiest thing for you to do is use one of the pre-packaged python distributions that already provide matplotlib built-in. The Continuum.io Python distribution `(Anaconda) -`_ for Windows, OS X, or Redhat +`_ for Windows, OS X, or Linux is an excellent choice that "just works" out of the box. The Enthought distribution `(Canopy) `_ is also a good a good choice From 970861789a3bd2a27131157e2ae548e18a5325ef Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 11:06:22 -0500 Subject: [PATCH 06/13] drops pylab reference --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 45269af8c142..36f79bc8ada9 100644 --- a/INSTALL +++ b/INSTALL @@ -17,7 +17,7 @@ Python distribution `(Anaconda) is an excellent choice that "just works" out of the box. The Enthought distribution `(Canopy) `_ is also a good a good choice -for any platform. Both of these packages include matplotlib and pylab, and +for any platform. Both of these packages include matplotlib and *lots* of other useful tools. matplotlib is also packaged for almost every major Linux distribution. So if you are on Linux, your package manager will probably provide matplotlib prebuilt. From 151d0dd779b2b99333a9838f3211132adbd89d4a Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 11:07:00 -0500 Subject: [PATCH 07/13] getting rid of extra space --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 36f79bc8ada9..2d0cb5655c88 100644 --- a/INSTALL +++ b/INSTALL @@ -19,7 +19,7 @@ The Enthought distribution `(Canopy) `_ is also a good a good choice for any platform. Both of these packages include matplotlib and *lots* of other useful tools. matplotlib is also packaged for almost -every major Linux distribution. So if you are on Linux, your package +every major Linux distribution. So if you are on Linux, your package manager will probably provide matplotlib prebuilt. Manually installing pre-built packages From b15855bb8e114770b5d414c33726eecbf5c0ef0e Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 14:46:56 -0500 Subject: [PATCH 08/13] both are good distributions --- INSTALL | 9 ++++----- README.osx | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 2d0cb5655c88..e7fcbc7bb648 100644 --- a/INSTALL +++ b/INSTALL @@ -13,11 +13,10 @@ the details (and potential complications) on this page, the easiest thing for you to do is use one of the pre-packaged python distributions that already provide matplotlib built-in. The Continuum.io Python distribution `(Anaconda) -`_ for Windows, OS X, or Linux -is an excellent choice that "just works" out of the box. -The Enthought distribution `(Canopy) -`_ is also a good a good choice -for any platform. Both of these packages include matplotlib and +`_ and the Enthought +distribution `(Canopy) `_ +are both excellent choices that "just work" out of the box for any +platform. Both of these packages include matplotlib and *lots* of other useful tools. matplotlib is also packaged for almost every major Linux distribution. So if you are on Linux, your package manager will probably provide matplotlib prebuilt. diff --git a/README.osx b/README.osx index 0cf5a39f2dc2..0d528d28122a 100644 --- a/README.osx +++ b/README.osx @@ -4,7 +4,7 @@ different types of zlib, png and freetype that may be on your system. For developers who want to build matplotlib from source, the recommended and supported way to build is to use a third-party package manager to install the required dependencies, and then install matplotlib from source using the -setup.py script. Three widely used package managers are conda, homebrew, and +setup.py script. Three widely used package managers are homebrew, and MacPorts. The following example illustrates how to install libpng and freetype using conda: From 5dbd9c1becee85b92e37f264234718594c1ff03e Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sat, 12 Jul 2014 14:48:14 -0500 Subject: [PATCH 09/13] conda libpng and freetype don't help --- README.osx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/README.osx b/README.osx index 0d528d28122a..f1756813631f 100644 --- a/README.osx +++ b/README.osx @@ -6,13 +6,7 @@ supported way to build is to use a third-party package manager to install the required dependencies, and then install matplotlib from source using the setup.py script. Three widely used package managers are homebrew, and MacPorts. The following example illustrates how to install libpng and freetype -using conda: - -Example usage:: - - conda install libpng freetype - -If you are using homebrew, execute the following instead: +using brew: Example usage:: @@ -32,6 +26,6 @@ Example usage:: Note that your environment is somewhat important. Some conda users have -found that their PYTHONPATH must include +found that, to run the tests, their PYTHONPATH must include /path/to/anaconda/.../site-packages and their DYLD_FALLBACK_LIBRARY_PATH must include /path/to/anaconda/lib. From c10a7a2f34cf3ba3b7e7dbad498369282e1e7048 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sun, 13 Jul 2014 10:22:13 -0700 Subject: [PATCH 10/13] Two --- README.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.osx b/README.osx index f1756813631f..12915d488bf3 100644 --- a/README.osx +++ b/README.osx @@ -4,7 +4,7 @@ different types of zlib, png and freetype that may be on your system. For developers who want to build matplotlib from source, the recommended and supported way to build is to use a third-party package manager to install the required dependencies, and then install matplotlib from source using the -setup.py script. Three widely used package managers are homebrew, and +setup.py script. Two widely used package managers are homebrew, and MacPorts. The following example illustrates how to install libpng and freetype using brew: From a5ffb9ef771b349041544de70f76d40ab11fc5f2 Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Sun, 13 Jul 2014 10:26:12 -0700 Subject: [PATCH 11/13] moves libpng from optional to required --- INSTALL | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/INSTALL b/INSTALL index e7fcbc7bb648..1b7150f2cd98 100644 --- a/INSTALL +++ b/INSTALL @@ -196,6 +196,12 @@ six 1.3 or later Python 2/3 compatibility library. This is also a dependency of :term:`dateutil`. +libpng 1.2 (or later) + library for loading and saving :term:`PNG` files (`download + `__). libpng requires + zlib. If you are a Windows user, you can ignore this because we + build support into the matplotlib single-click installer + **Optional GUI frameworks** @@ -239,13 +245,6 @@ ImageMagick user, you can ignore this since we build support into the matplotlib single click installer. - -libpng 1.2 (or later) - library for loading and saving :term:`PNG` files (`download - `__). libpng requires - zlib. If you are a Windows user, you can ignore this because we - build support into the matplotlib single-click installer - **Required libraries that ship with matplotlib** :term:`agg` 2.4 From b974bd1403d495c6ce33a6a88701e559099d1aee Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Mon, 14 Jul 2014 14:28:20 -0700 Subject: [PATCH 12/13] puts pythonxy back in --- INSTALL | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 1b7150f2cd98..f6b7d396343b 100644 --- a/INSTALL +++ b/INSTALL @@ -17,7 +17,9 @@ Python distribution `(Anaconda) distribution `(Canopy) `_ are both excellent choices that "just work" out of the box for any platform. Both of these packages include matplotlib and -*lots* of other useful tools. matplotlib is also packaged for almost +*lots* of other useful tools. +Another excellent alternative for Windows users is `Python (x, y) +`_ . matplotlib is also packaged for almost every major Linux distribution. So if you are on Linux, your package manager will probably provide matplotlib prebuilt. From 2ecabc13582a9914c85ba57bd9daa6b8abe1a8ea Mon Sep 17 00:00:00 2001 From: Katy Huff Date: Wed, 16 Jul 2014 08:25:48 -0700 Subject: [PATCH 13/13] python(x,y) is now on google code? --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index f6b7d396343b..3a72974ca192 100644 --- a/INSTALL +++ b/INSTALL @@ -19,7 +19,7 @@ are both excellent choices that "just work" out of the box for any platform. Both of these packages include matplotlib and *lots* of other useful tools. Another excellent alternative for Windows users is `Python (x, y) -`_ . matplotlib is also packaged for almost +`_ . matplotlib is also packaged for almost every major Linux distribution. So if you are on Linux, your package manager will probably provide matplotlib prebuilt.