summaryrefslogtreecommitdiff
path: root/scipy/basic
diff options
context:
space:
mode:
Diffstat (limited to 'scipy/basic')
-rw-r--r--scipy/basic/03_ipython_plotting.tex4
-rw-r--r--scipy/basic/11_notebook.tex21
-rw-r--r--scipy/basic/circulate/sample.ipynb4
3 files changed, 16 insertions, 13 deletions
diff --git a/scipy/basic/03_ipython_plotting.tex b/scipy/basic/03_ipython_plotting.tex
index eba7568..54c151d 100644
--- a/scipy/basic/03_ipython_plotting.tex
+++ b/scipy/basic/03_ipython_plotting.tex
@@ -193,8 +193,8 @@ Python}
\frametitle{Starting up \ldots}
\begin{block}{Start a terminal}
\begin{itemize}
- \item Open Terminal with Anaconda Navigator
- \item Or any other approach
+ \item Using Anaconda Navigator
+ \item Or another approach
\end{itemize}
\end{block}
diff --git a/scipy/basic/11_notebook.tex b/scipy/basic/11_notebook.tex
index 4442c9f..634a9c6 100644
--- a/scipy/basic/11_notebook.tex
+++ b/scipy/basic/11_notebook.tex
@@ -158,11 +158,12 @@ Mumbai, India
\end{itemize}
\item Powerful and convenient
\item Must be installed as a package
+ \item Part of anaconda
\end{itemize}
\end{frame}
\begin{frame}
- \frametitle{IPython notebook}
+ \frametitle{Jupyter notebooks}
\begin{itemize}
\item Create and share documents containing
\begin{itemize}
@@ -213,9 +214,9 @@ Console
$ ipython
\end{lstlisting} %$
\vspace*{0.25in}
-The notebook:
+Or perhaps:
\begin{lstlisting}
-$ ipython notebook
+$ ipython --pylab
\end{lstlisting} %$
\end{frame}
@@ -232,10 +233,11 @@ $ jupyter notebook
\end{frame}
\begin{frame}[fragile]
- \frametitle{IPython notebooks and Canopy}
+ \frametitle{Jupyter notebooks and Anaconda}
\begin{itemize}
- \item Can directly open \typ{*.ipynb} files from Canopy
- \item Or create a new notebook using the File menu
+ \item On the terminal
+ \item On the navigator
+ \item Via the menu
\end{itemize}
\end{frame}
@@ -269,20 +271,19 @@ In []: plt.plot(x, sin(x))
\item \typ{\%pylab}: imports pylab
\item \typ{\%matplotlib}: just sets up the plotting, no imports
\item Using explicit imports is cleaner
- \item \typ{pyplot} provides the useful functionality
+ \item \typ{pyplot} provides the functionality
\item Could also just import \typ{pylab}
\end{itemize}
\end{frame}
\begin{frame}[fragile]
- \frametitle{Using the IPython notebook}
+ \frametitle{Using Jupyter notebooks}
\begin{itemize}
\item Start the notebook
\item Try:
\typ{jupyter notebook}
- \item If that doesn't work use \typ{ipython notebook}
- \item Create a new Python 2 or Python 3 notebook
+ \item Create a new Python 3 notebook
\end{itemize}
\end{frame}
diff --git a/scipy/basic/circulate/sample.ipynb b/scipy/basic/circulate/sample.ipynb
index 1e542e9..0576421 100644
--- a/scipy/basic/circulate/sample.ipynb
+++ b/scipy/basic/circulate/sample.ipynb
@@ -166,7 +166,9 @@
}
],
"source": [
- "%pylab inline\n"
+ "%pylab inline\n",
+ "# Also try\n",
+ "# %pylab notebook"
]
},
{