From 7915805501203cf59e5c73bebc5a43bed11d631a Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:45:58 +0100 Subject: [PATCH 01/11] fix trailing whitespace --- docs/scenarios/scientific.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 5dadae7ce..9ba928ab3 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -46,8 +46,8 @@ Installing NumPy and SciPy can be a daunting task. Which is why the `Enthought Python distribution `_ was created. With Enthought, scientific python has never been easier (one click to install about 100 scientific python packages). The Enthought Python Distribution comes in two -variants: a free version `EPD Free `_ -and a paid version with various `pricing options. +variants: a free version `EPD Free `_ +and a paid version with various `pricing options. `_ Matplotlib From 70c7f81441dfa306a832ce7afd41df0480bc549b Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:52:02 +0100 Subject: [PATCH 02/11] add matplotlib to sentence about packages In general, when people speak about scientific Python, the mention the trinity of Numpy, Scipy and Matplotlib. --- docs/scenarios/scientific.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 9ba928ab3..21bca2dfc 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -11,8 +11,8 @@ and it performs really well. Due to its high performance nature, scientific computing in python often refers to external libraries, typically written in faster languages (like C, or FORTRAN -for matrix operations). The main libraries used are `NumPy`_ and -`SciPy`_. +for matrix operations). The main libraries used are `NumPy`_, +`SciPy`_ and `Matplotlib`_. Libraries ::::::::: From 9ecebf5801d3289921f04522c9b4f955faa9682e Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:53:39 +0100 Subject: [PATCH 03/11] move the Matplotlib section up If the introduction mentions Numpy, Scipy and then Matplotlib -- they should appear in that order in the 'Libraries' section. --- docs/scenarios/scientific.rst | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 21bca2dfc..e6c0602d7 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -39,6 +39,15 @@ modules for various commonly used tasks in scientific programing like linear algebra, integration (calculus), ordinary differential equation solvers and signal processing. +Matplotlib +---------- + +`matplotlib `_ is a flexible plotting +library for creating interactive 2D and 3D plots that can also be saved as +manuscript-quality figures. The API in many ways reflects that of `MATLAB `_, +easing transition of MATLAB users to Python. Many examples, along with the +source code to re-create them, can be browsed at the `matplotlib gallery `_. + Enthought --------- @@ -50,14 +59,6 @@ variants: a free version `EPD Free ` and a paid version with various `pricing options. `_ -Matplotlib ----------- - -`matplotlib `_ is a flexible plotting -library for creating interactive 2D and 3D plots that can also be saved as -manuscript-quality figures. The API in many ways reflects that of `MATLAB `_, -easing transition of MATLAB users to Python. Many examples, along with the -source code to re-create them, can be browsed at the `matplotlib gallery `_. Resources ::::::::: From 39e0b381c1e5e3aea8dc5073c7e82a5bbfe2719d Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:55:18 +0100 Subject: [PATCH 04/11] fix capitalization --- docs/scenarios/scientific.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index e6c0602d7..8164cd76c 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -42,7 +42,7 @@ signal processing. Matplotlib ---------- -`matplotlib `_ is a flexible plotting +`Matplotlib `_ is a flexible plotting library for creating interactive 2D and 3D plots that can also be saved as manuscript-quality figures. The API in many ways reflects that of `MATLAB `_, easing transition of MATLAB users to Python. Many examples, along with the From b7755bce6fc657c60db8da6147f7a71a9037e721 Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:56:01 +0100 Subject: [PATCH 05/11] limit line length to 80 --- docs/scenarios/scientific.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 8164cd76c..e91f096a5 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -44,9 +44,11 @@ Matplotlib `Matplotlib `_ is a flexible plotting library for creating interactive 2D and 3D plots that can also be saved as -manuscript-quality figures. The API in many ways reflects that of `MATLAB `_, -easing transition of MATLAB users to Python. Many examples, along with the -source code to re-create them, can be browsed at the `matplotlib gallery `_. +manuscript-quality figures. The API in many ways reflects that of `MATLAB +`_, easing transition of MATLAB +users to Python. Many examples, along with the source code to re-create them, +can be browsed at the `matplotlib gallery +`_. Enthought --------- From fadc69206a2522a6a6a73d7def5bb9dd042d17d0 Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:56:28 +0100 Subject: [PATCH 06/11] insert whitespace after headings for source coherence --- docs/scenarios/scientific.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index e91f096a5..1beb8fb46 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -19,6 +19,7 @@ Libraries NumPy ----- + `NumPy `_ is a low level library written in C (and FORTRAN) for high level mathematical functions. NumPy cleverly overcomes the problem of running slower algorithms on Python by using multidimensional arrays @@ -33,6 +34,7 @@ NumPy is compatible with Python versions 2.4 through to 2.7.2 and 3.1+. SciPy ----- + `SciPy `_ is a library that uses Numpy for more mathematical function. SciPy uses NumPy arrays as its basic data structure. SciPy comes with modules for various commonly used tasks in scientific programing like linear From 46d48e87484741bcba71acd306a7fc4c723f1c49 Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 21:58:29 +0100 Subject: [PATCH 07/11] grammar and wording tweaks for the scipy description --- docs/scenarios/scientific.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 1beb8fb46..2e73971f7 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -36,10 +36,10 @@ SciPy ----- `SciPy `_ is a library that uses Numpy for more mathematical -function. SciPy uses NumPy arrays as its basic data structure. SciPy comes with -modules for various commonly used tasks in scientific programing like linear -algebra, integration (calculus), ordinary differential equation solvers and -signal processing. +functions. SciPy uses NumPy arrays as the basic data structure. SciPy comes +with modules for various commonly used tasks in scientific programing, for +example: linear algebra, integration (calculus), ordinary differential equation +solvers and signal processing. Matplotlib ---------- From 15394324a2e8c5fbb5c0af02854fd09f06e73c4a Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 22:04:28 +0100 Subject: [PATCH 08/11] collect all Python distributions under 'Resources' Also add a short section introduction about the purpose of this section. --- docs/scenarios/scientific.rst | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 2e73971f7..3b1da876b 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -52,21 +52,17 @@ users to Python. Many examples, along with the source code to re-create them, can be browsed at the `matplotlib gallery `_. -Enthought ---------- - -Installing NumPy and SciPy can be a daunting task. Which is why the -`Enthought Python distribution `_ was created. With -Enthought, scientific python has never been easier (one click to install about -100 scientific python packages). The Enthought Python Distribution comes in two -variants: a free version `EPD Free `_ -and a paid version with various `pricing options. -`_ - - Resources ::::::::: +Installation of scientific Python packages can be troublesome. Many of these +packages are implemented as Python C extensions which need to be compiled. +This section lists various so-called Python distributions which provide precompiled and +easy-to-install collections of scientific Python packages. + +Unofficial Windows Binaries for Python Extension Packages +--------------------------------------------------------- + Many people who do scientific computing are on Windows. And yet many of the scientific computing packages are notoriously difficult to build and install. `Christoph Gohlke `_ however, has @@ -74,6 +70,13 @@ compiled a list of Windows binaries for many useful Python packages. The list of packages has grown from a mainly scientific python resource to a more general list. It might be a good idea to check it out if you're on Windows. -For a quick introduction to scientific python: +Enthought +--------- -http://scipy-lectures.github.com +Installing NumPy and SciPy can be a daunting task. Which is why the +`Enthought Python distribution `_ was created. With +Enthought, scientific python has never been easier (one click to install about +100 scientific python packages). The Enthought Python Distribution comes in two +variants: a free version `EPD Free `_ +and a paid version with various `pricing options. +`_ From d73f3408a6faac34dde3636bd94cfe0e621feabb Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 22:06:01 +0100 Subject: [PATCH 09/11] fix name of the EPD --- docs/scenarios/scientific.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 3b1da876b..b0e62fb9d 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -70,8 +70,8 @@ compiled a list of Windows binaries for many useful Python packages. The list of packages has grown from a mainly scientific python resource to a more general list. It might be a good idea to check it out if you're on Windows. -Enthought ---------- +Enthought Python Distribution (EPD) +----------------------------------- Installing NumPy and SciPy can be a daunting task. Which is why the `Enthought Python distribution `_ was created. With From 852f29d5681b1f414e679c4b3ab84f29a6b3e039 Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 22:18:39 +0100 Subject: [PATCH 10/11] add Anaconda --- docs/scenarios/scientific.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index b0e62fb9d..2c515b070 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -80,3 +80,14 @@ Enthought, scientific python has never been easier (one click to install about variants: a free version `EPD Free `_ and a paid version with various `pricing options. `_ + +Anaconda +-------- + +`Continuum Analytics `_ offers the `Anaconda +Python Distribution `_ which +includes all the common scientific python packages and additionally many +packages related to data analytics and big data. Anaconda comes in two +flavours, a paid for version and a completely free and open source community +edition, Anaconda CE, which contains a slightly reduced feature set. Free +licences for the paid-for version are available for academics and researchers. From 9cbaf20138eadf745317010d7b1608225515beeb Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Thu, 21 Feb 2013 22:26:12 +0100 Subject: [PATCH 11/11] mention the Python Scientific Lecture Notes --- docs/scenarios/scientific.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst index 2c515b070..a8cddde23 100644 --- a/docs/scenarios/scientific.rst +++ b/docs/scenarios/scientific.rst @@ -10,9 +10,12 @@ is widely used in academia and scientific projects because it is easy to write, and it performs really well. Due to its high performance nature, scientific computing in python often refers -to external libraries, typically written in faster languages (like C, or FORTRAN -for matrix operations). The main libraries used are `NumPy`_, -`SciPy`_ and `Matplotlib`_. +to external libraries, typically written in faster languages (like C, or +FORTRAN for matrix operations). The main libraries used are `NumPy`_, `SciPy`_ +and `Matplotlib`_. Going into detail about these libraries is beyond the scope +of the Python guide. However, a comprehensive introduction to the scientific +Python ecosystem can be found in the `Python Scientific Lecture Notes +`_ Libraries :::::::::