From 0caaa5523f760eb9be5130c779df09adfc38c369 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Wed, 17 Jan 2018 12:26:36 +0000
Subject: [PATCH] Add changelog for v 4.8

---
 docs/changelog.rst    | 15 +++++++++++++++
 docs/conf.py          |  3 +++
 docs/requirements.txt |  1 +
 readthedocs.yml       |  1 +
 4 files changed, 20 insertions(+)
 create mode 100644 docs/requirements.txt

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a5d950d77..6d4b5e258 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,21 @@
 Changes in IPython kernel
 =========================
 
+4.8
+---
+
+4.8.0
+*****
+
+`4.8.0 on GitHub <https://github.com/ipython/ipykernel/milestones/4.8>`__
+
+- Cleanly shutdown integrated event loops when shutting down the kernel.
+  (:ghpull:`290`)
+- ``%gui qt`` now uses Qt 5 by default rather than Qt 4, following a similar
+  change in terminal IPython. (:ghpull:`293`)
+- Fix event loop integration for :mod:`asyncio` when run with Tornado 5,
+  which uses asyncio where available. (:ghpull:`296`)
+
 4.7
 ---
 
diff --git a/docs/conf.py b/docs/conf.py
index 4c0361199..d7a215ba3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -33,8 +33,11 @@
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
+    'sphinxcontrib_github_alt',
 ]
 
+github_project_url = "https://github.com/ipython/ipykernel"
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 000000000..623e487ab
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+sphinxcontrib_github_alt
diff --git a/readthedocs.yml b/readthedocs.yml
index f8b3b417d..a2bc2646f 100644
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -1,3 +1,4 @@
 python:
   version: 3.5
   pip_install: true
+requirements_file: docs/requirements.txt