update notebooks to use scikit-learn 0.19.1 and Python 3.6

dariushazimi · Jun 29, 2018 · 283ef07 · 283ef07
1 parent 1a20cab
commit 283ef07
Show file tree

Hide file tree

Showing 9 changed files with 1,485 additions and 971 deletions.
diff --git a/01_machine_learning_intro.ipynb b/01_machine_learning_intro.ipynb
@@ -4,8 +4,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# What is machine learning, and how does it work?\n",
-    "*From the video series: [Introduction to machine learning with scikit-learn](https://github.com/justmarkham/scikit-learn-videos)*"
+    "# What is machine learning, and how does it work? ([video #1](https://www.youtube.com/watch?v=elojMnjn4kk&list=PL5-da3qGB5ICeMbQuqbbCOQWcS6OYBr5A&index=1))\n",
+    "\n",
+    "Created by [Data School](http://www.dataschool.io/). Watch all 9 videos on [YouTube](https://www.youtube.com/playlist?list=PL5-da3qGB5ICeMbQuqbbCOQWcS6OYBr5A). Download the notebooks from [GitHub](https://github.com/justmarkham/scikit-learn-videos)."
    ]
   },
   {
@@ -143,9 +144,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -238,23 +237,23 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 2",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "python2"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.11"
+   "pygments_lexer": "ipython3",
+   "version": "3.6.5"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/02_machine_learning_setup.ipynb b/02_machine_learning_setup.ipynb
@@ -4,8 +4,11 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Setting up Python for machine learning: scikit-learn and IPython Notebook\n",
-    "*From the video series: [Introduction to machine learning with scikit-learn](https://github.com/justmarkham/scikit-learn-videos)*"
+    "# Setting up Python for machine learning: scikit-learn and Jupyter Notebook ([video #2](https://www.youtube.com/watch?v=IsXXlYVBt1M&list=PL5-da3qGB5ICeMbQuqbbCOQWcS6OYBr5A&index=2))\n",
+    "\n",
+    "Created by [Data School](http://www.dataschool.io/). Watch all 9 videos on [YouTube](https://www.youtube.com/playlist?list=PL5-da3qGB5ICeMbQuqbbCOQWcS6OYBr5A). Download the notebooks from [GitHub](https://github.com/justmarkham/scikit-learn-videos).\n",
+    "\n",
+    "**Note:** Since the video recording, the official name of the \"IPython Notebook\" was changed to \"Jupyter Notebook\". However, the functionality is the same."
    ]
   },
   {
@@ -16,7 +19,7 @@
     "\n",
     "- What are the benefits and drawbacks of scikit-learn?\n",
     "- How do I install scikit-learn?\n",
-    "- How do I use the IPython Notebook?\n",
+    "- How do I use the Jupyter Notebook?\n",
     "- What are some good resources for learning Python?"
    ]
   },
@@ -68,10 +71,10 @@
     "\n",
     "**Option 1:** [Install scikit-learn library](http://scikit-learn.org/stable/install.html) and dependencies (NumPy and SciPy)\n",
     "\n",
-    "**Option 2:** [Install Anaconda distribution](https://www.continuum.io/downloads) of Python, which includes:\n",
+    "**Option 2:** [Install Anaconda distribution](https://www.anaconda.com/download/) of Python, which includes:\n",
     "\n",
     "- Hundreds of useful packages (including scikit-learn)\n",
-    "- IPython and IPython Notebook\n",
+    "- IPython and Jupyter Notebook\n",
     "- conda package manager\n",
     "- Spyder IDE"
    ]
@@ -80,14 +83,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "![IPython header](images/02_ipython_header.png)"
+    "![Jupyter logo](images/02_jupyter_logo.svg)"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Using the IPython Notebook\n",
+    "## Using the Jupyter Notebook\n",
     "\n",
     "### Components:\n",
     "\n",
@@ -96,12 +99,12 @@
     "\n",
     "### Installation:\n",
     "\n",
-    "- **Option 1:** Install [IPython](http://ipython.org/install.html) and the [notebook](https://jupyter.readthedocs.io/en/latest/install.html)\n",
+    "- **Option 1:** [Install the Jupyter notebook](https://jupyter.readthedocs.io/en/latest/install.html) (includes IPython)\n",
     "- **Option 2:** Included with the Anaconda distribution\n",
     "\n",
     "### Launching the Notebook:\n",
     "\n",
-    "- Type **ipython notebook** at the command line to open the dashboard\n",
+    "- Type **jupyter notebook** at the command line to open the dashboard\n",
     "- Don't close the command line window while the Notebook is running\n",
     "\n",
     "### Keyboard shortcuts:\n",
@@ -119,11 +122,11 @@
     "- **Ctrl+Enter** to run a cell\n",
     "- Switch to Command mode using **Esc**\n",
     "\n",
-    "### IPython and Markdown resources:\n",
+    "### IPython, Jupyter, and Markdown resources:\n",
     "\n",
     "- [nbviewer](http://nbviewer.jupyter.org/): view notebooks online as static documents\n",
-    "- [IPython documentation](http://ipython.readthedocs.io/en/stable/): focuses on the interpreter\n",
-    "- [IPython Notebook tutorials](http://jupyter.readthedocs.io/en/latest/content-quickstart.html): in-depth introduction\n",
+    "- [IPython documentation](http://ipython.readthedocs.io/en/stable/)\n",
+    "- [Jupyter Notebook quickstart](http://jupyter.readthedocs.io/en/latest/content-quickstart.html)\n",
     "- [GitHub's Mastering Markdown](https://guides.github.com/features/mastering-markdown/): short guide with lots of examples"
    ]
   },
@@ -133,10 +136,10 @@
    "source": [
     "## Resources for learning Python\n",
     "\n",
-    "- [Codecademy's Python course](https://www.codecademy.com/learn/python): browser-based, tons of exercises\n",
+    "- [Codecademy's Python course](https://www.codecademy.com/learn/learn-python): browser-based, tons of exercises\n",
     "- [DataQuest](https://www.dataquest.io/): browser-based, teaches Python in the context of data science\n",
     "- [Google's Python class](https://developers.google.com/edu/python/): slightly more advanced, includes videos and downloadable exercises (with solutions)\n",
-    "- [Python for Informatics](http://www.pythonlearn.com/): beginner-oriented book, includes slides and videos"
+    "- [Python for Everybody](https://www.py4e.com/): beginner-oriented book, includes slides and videos"
    ]
   },
   {
@@ -153,9 +156,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -248,23 +249,23 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 2",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "python2"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.11"
+   "pygments_lexer": "ipython3",
+   "version": "3.6.5"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }