Merge pull request #2 from ankitjavalkar/remove-canopy

Remove references to Canopy

9 files changed, 195 insertions, 39 deletions

diff --git a/advanced_python/01_intro.tex b/advanced_python/01_intro.tex
index ce75248..f0216c6 100644
--- a/advanced_python/01_intro.tex
+++ b/advanced_python/01_intro.tex
@@ -34,15 +34,14 @@
   \item Uses Python 3.x exclusively
   \item Use any reasonable editor
     \begin{itemize}
-    \item Canopy
     \item Spyder
     \item Emacs/Vim
     \item VS Code \url{code.visualstudio.com}
     \end{itemize}
   \item Any Python environment works
     \begin{itemize}
-    \item Canopy/EDM
     \item Conda/Anaconda
+    \item Enthought Deployment Manager (EDM)
     \item Standard Python
     \end{itemize}
   \item IPython
diff --git a/advanced_python/README.md b/advanced_python/README.md
index e7fb8cd..8251e64 100644
--- a/advanced_python/README.md
+++ b/advanced_python/README.md
@@ -12,7 +12,7 @@ and requires the use of yaksh for practice, self-assessment, and assessment.
 
 - Students should have completed the basic Python programming material.
 - One should have a Python 3.x installation with IPython installed.
-- Use a reasonable editor, Canopy will work.
+- Use a reasonable editor, Spyder will work.
 - If one desires a more advanced editor, I suggest VS Code
   (https://code.visualstudio.com/) which is free, open source, and very
   powerful.
diff --git a/basic_python/README.md b/basic_python/README.md
index ddc0a1e..54066b7 100644
--- a/basic_python/README.md
+++ b/basic_python/README.md
@@ -37,11 +37,10 @@ hands-on session.
 Please install Python 3.x (or 2.7.x if 3.x is not available) for this course.
 
 On Linux, Windows and Mac OS X it is easiest to install Python and many other
-useful packages by installing Canopy. Download the Canopy Python distribution
-for your OS and architecture from here: https://store.enthought.com/downloads .
+useful packages by installing Anaconda. Download the Anaconda Python distribution
+for your OS and architecture from here: https://www.anaconda.com/products/individual. The instructions to install are available here https://docs.anaconda.com/anaconda/install/
 
-You could also use Anaconda or Conda along with the Spyder editor to obtain
-the requirements.
+You can use Anaconda or Conda along with the Spyder editor or the VSCode editor.
 
 On many Linux distributions, Python is already available. We suggest that you
 install Python 3.x and are comfortable with any text editor. Editors that
diff --git a/data_analysis/README.md b/data_analysis/README.md
index a00b95d..3809dc2 100644
--- a/data_analysis/README.md
+++ b/data_analysis/README.md
@@ -22,7 +22,7 @@ attendees links to some useful material.
 - One should have a Python 3.x installation with the following packages:
     - IPython, scipy, matplotlib
     - pandas, statsmodels
-- Use a reasonable editor, Canopy will work.
+- Use a reasonable editor, Spyder will work.
 - If one desires a more advanced editor, I suggest VS Code
   (https://code.visualstudio.com/) which is free, open source, and very
   powerful.
diff --git a/scipy/basic/02_prelims.tex b/scipy/basic/02_prelims.tex
index e613082..59fbffa 100644
--- a/scipy/basic/02_prelims.tex
+++ b/scipy/basic/02_prelims.tex
@@ -207,18 +207,6 @@ $
 \end{frame}
 
 \begin{frame}
-  \frametitle{Python distribution: Canopy}
-  \begin{itemize}
-  \item \url{www.enthought.com/products/canopy}
-  \item Easy to use
-  \item Simple IDE
-  \item Cross platform: Linux, OSX, Windows
-  \item Free installer
-  \item Many packages
-  \end{itemize}
-\end{frame}
-
-\begin{frame}
   \frametitle{Python distribution: Anaconda}
   \begin{itemize}
   \item \url{www.continuum.io/downloads}
@@ -231,9 +219,9 @@ $
 \begin{frame}[plain]
   \frametitle{For this course}
   \begin{itemize}
-  \item Using Canopy
-  \item Simple UI
+  \item Using Anaconda
   \item Easy for beginners
+  \item Pre-installed with relevant packages
     \vspace*{0.25in}
   \item Advanced users can use anything they want!
   \end{itemize}
@@ -244,7 +232,7 @@ $
   \begin{itemize}
     \item Download for your platform
     \item Install it
-    \item Start Canopy
+    \item Start Anaconda
   \end{itemize}
 \end{frame}
 
diff --git a/scipy/basic/02a_anaconda.tex b/scipy/basic/02a_anaconda.tex
new file mode 100644
index 0000000..13f4d6f
--- /dev/null
+++ b/scipy/basic/02a_anaconda.tex
@@ -0,0 +1,172 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%Tutorial slides on Python.
+%
+% Author: FOSSEE
+% Copyright (c) 2009-2016, FOSSEE, IIT Bombay
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[14pt,compress]{beamer}
+
+% Modified from: generic-ornate-15min-45min.de.tex
+\mode<presentation>
+{
+  \usetheme{Warsaw}
+  \useoutertheme{infolines}
+  \setbeamercovered{transparent}
+}
+
+% Remove navigation symbols.
+\setbeamertemplate{navigation symbols}{}
+
+\usepackage[english]{babel}
+\usepackage[latin1]{inputenc}
+%\usepackage{times}
+\usepackage[T1]{fontenc}
+
+% Taken from Fernando's slides.
+\usepackage{ae,aecompl}
+\usepackage{mathpazo,courier,euler}
+\usepackage[scaled=.95]{helvet}
+
+\definecolor{darkgreen}{rgb}{0,0.5,0}
+
+\usepackage{listings}
+\lstset{language=Python,
+    basicstyle=\ttfamily\bfseries,
+    commentstyle=\color{red}\itshape,
+  stringstyle=\color{darkgreen},
+  showstringspaces=false,
+  keywordstyle=\color{blue}\bfseries}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Macros
+\setbeamercolor{emphbar}{bg=blue!20, fg=black}
+\newcommand{\emphbar}[1]
+{\begin{beamercolorbox}[rounded=true]{emphbar}
+      {#1}
+ \end{beamercolorbox}
+}
+\newcounter{time}
+\setcounter{time}{0}
+\newcommand{\inctime}[1]{\addtocounter{time}{#1}{\tiny \thetime\ m}}
+
+\newcommand{\typ}[1]{\lstinline{#1}}
+
+\newcommand{\kwrd}[1]{ \texttt{\textbf{\color{blue}{#1}}}  }
+
+\newcommand\BackgroundPicture[1]{%
+  \setbeamertemplate{background}{%
+      \parbox[c][\paperheight]{\paperwidth}{%
+      \vfill \hfill
+        \pgfimage[width=1.0\paperwidth,height=1.0\paperheight]{#1}
+ \hfill \vfill
+}}}
+
+% For non-wide pictures, set the width so that the height scales
+% appropriately.
+\newcommand\BackgroundPictureWidth[1]{%
+  \setbeamertemplate{background}{%
+      \parbox[c][\paperheight]{\paperwidth}{%
+      \vfill \hfill
+        \pgfimage[width=1.0\paperwidth]{#1}
+ \hfill \vfill
+}}}
+
+% For shorter pictures, set the height so that the width scales
+% appropriately.
+\newcommand\BackgroundPictureHeight[1]{%
+  \setbeamertemplate{background}{%
+      \parbox[c][\paperheight]{\paperwidth}{%
+      \vfill \hfill
+        \pgfimage[height=1.0\paperheight]{#1}
+ \hfill \vfill
+}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Title page
+\title[Preliminaries]{Introductory Scientific Computing with
+Python}
+\subtitle{Using Anaconda}
+
+\author[FOSSEE] {FOSSEE}
+
+\institute[IIT Bombay] {Department of Aerospace Engineering\\IIT Bombay}
+\date[] {Mumbai, India
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%\pgfdeclareimage[height=0.75cm]{iitmlogo}{iitmlogo}
+%\logo{\pgfuseimage{iitmlogo}}
+
+
+%% Delete this, if you do not want the table of contents to pop up at
+%% the beginning of each subsection:
+\AtBeginSubsection[]
+{
+  \begin{frame}<beamer>
+    \frametitle{Outline}
+    \tableofcontents[currentsection,currentsubsection]
+  \end{frame}
+}
+
+\AtBeginSection[]
+{
+  \begin{frame}<beamer>
+    \frametitle{Outline}
+    \tableofcontents[currentsection,currentsubsection]
+  \end{frame}
+}
+
+% If you wish to uncover everything in a step-wise fashion, uncomment
+% the following command:
+%\beamerdefaultoverlayspecification{<+->}
+
+%%\includeonlyframes{current,current1,current2,current3,current4,current5,current6}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% DOCUMENT STARTS
+\begin{document}
+
+\begin{frame}
+  \maketitle
+\end{frame}
+
+\begin{frame}
+  \frametitle{Python distribution: Anaconda}
+  \begin{itemize}
+  \item \url{www.continuum.io/downloads}
+  \item Cross platform: Linux, OSX, Windows
+  \item Free installer
+  \item Many packages
+  \end{itemize}
+\end{frame}
+
+\begin{frame}[plain]
+  \frametitle{For this course}
+  \begin{itemize}
+  \item Using Anaconda
+  \item Easy for beginners
+  \item Pre-installed with relevant packages
+    \vspace*{0.25in}
+  \item Advanced users can use anything they want!
+  \end{itemize}
+\end{frame}
+
+\begin{frame}[plain]
+  \frametitle{Setup Anaconda}
+  \begin{itemize}
+    \item Download for your platform
+    \item Install it
+    \item Start Anaconda Navigator
+  \end{itemize}
+\end{frame}
+
+\begin{frame}[plain]
+  \frametitle{Launch Spyder IDE}
+  \begin{itemize}
+    \item Start Spyder IDE from the Anaconda GUI
+  \end{itemize}
+\end{frame}
+
+
+\end{document}
diff --git a/scipy/basic/03_ipython_plotting.tex b/scipy/basic/03_ipython_plotting.tex
index 465d4f0..326ad79 100644
--- a/scipy/basic/03_ipython_plotting.tex
+++ b/scipy/basic/03_ipython_plotting.tex
@@ -138,7 +138,7 @@ Python}
 \begin{frame}
 \frametitle{Checklist}
   \begin{enumerate}
-    \item Editor - we recommend \alert{Canopy}
+    \item Editor - we recommend \alert{Spyder}
     \item IPython
     \item Data files:
       \begin{itemize}
@@ -193,7 +193,7 @@ Python}
 \frametitle{Starting up \ldots}
 \begin{block}{Start a terminal}
   \begin{itemize}
-    \item Canopy command prompt (Tools menu)
+    \item Open Terminal using Anaconda Navigator
 \end{itemize}
 \end{block}
 
@@ -269,7 +269,7 @@ Breaking out of loops
   \begin{itemize}
   \item Exit the IPython interpreter
   \item Close the terminal
-  \item Restart the terminal (Canopy tools menu)
+  \item Restart the terminal
   \item Restart IPython using:
   \end{itemize}
 \begin{lstlisting}
@@ -462,7 +462,6 @@ In []: legend(['sin(2y)'], loc='center')
 \begin{lstlisting}
 'best'
 'right'
-'left'
 'center'
 \end{lstlisting}
 \end{columns}
diff --git a/scipy/basic/04_saving_scripts.tex b/scipy/basic/04_saving_scripts.tex
index 356f10f..e7f1698 100644
--- a/scipy/basic/04_saving_scripts.tex
+++ b/scipy/basic/04_saving_scripts.tex
@@ -201,7 +201,7 @@ Saves from history the commands entered on line numbers \alert{16, 18, 19, 20, \
   \item Save lines relevant for the review problem
   \item Hint: example\\ \typ{\%save four_plot.py 16 18-27}
   \item Choose the lines carefully
-  \item Edit \typ{four_plot.py} on Canopy
+  \item Edit \typ{four_plot.py} on Spyder
   \item Make sure all the lines are correct
   \item Save the script
   \end{itemize}
@@ -211,7 +211,7 @@ Saves from history the commands entered on line numbers \alert{16, 18, 19, 20, \
 \begin{frame}[fragile]
   \frametitle{Creating scripts: alternative}
   \begin{itemize}
-  \item Create a new file on Canopy
+  \item Create a new file on Spyder
   \item Copy commands for assignment with your mouse
   \item Save the script to \typ{four_plot.py}
   \end{itemize}
@@ -269,7 +269,7 @@ In []: show()
 \begin{frame}[fragile]
   \frametitle{Running with Python}
   \begin{itemize}
-  \item Start a new Canopy terminal
+  \item Start a new terminal
   \item Change directory to where you saved \typ{four_plot.py}
   \item Run the script as:
   \end{itemize}
@@ -315,7 +315,7 @@ plot(x, x, 'b')
 \begin{frame}[fragile]
   \frametitle{Try again}
   \begin{itemize}
-  \item On Canopy terminal
+  \item On terminal
   \item Run the script as:
   \end{itemize}
 \begin{lstlisting}
@@ -388,13 +388,13 @@ show()
 \end{frame}
 
 \begin{frame}
-  \frametitle{Using Canopy}
+  \frametitle{Using Spyder and Anaconda}
   \begin{itemize}
   \item Much easier
   \item Write code in the editor
-  \item Embedded IPython
+  \item Embedded IPython Console
   \item Save (Ctrl-S or Cmd-S)
-  \item Run selection: Ctrl-Shift-R (Cmd-Shift-R on OS X)
+  \item Run selection: F9
   \item Run code: Ctrl-R (Cmd-R on OS X)
   \item Change directory with menu (\typ{\%cd})
   \end{itemize}
diff --git a/scipy/basic/README.md b/scipy/basic/README.md
index 59c8dc9..b26af41 100644
--- a/scipy/basic/README.md
+++ b/scipy/basic/README.md
@@ -46,12 +46,11 @@ The following packages need to be installed:
 - Matplotlib
 - Optionally install Mayavi.
 
-On Linux, Windows and Mac OS X it is easiest to install these by installing
-the Enthought Canopy. Download the Canopy Python distribution for your OS and
-architecture from here: https://store.enthought.com/downloads.
+On Linux, Windows and Mac OS X it is easiest to install Python and many other
+useful packages by installing Anaconda. Download the Anaconda Python distribution
+for your OS and architecture from here: https://www.anaconda.com/products/individual. The instructions to install are available here https://docs.anaconda.com/anaconda/install/
 
-You could also use Anaconda or Conda along with the Spyder editor to obtain
-the requirements.
+You can use Anaconda or Conda along with the Spyder editor or the VSCode editor.
 
 On many Linux distributions, these packages are easy to install.