diff --git a/.gitignore b/.gitignore
index d468cac..d7884ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ ipython-0.10.tar.gz
 /ipython-6.3.0.tar.gz
 /ipython-6.3.1.tar.gz
 /ipython-6.4.0.tar.gz
+/ipython-7.0.1.tar.gz
diff --git a/ipython.spec b/ipython.spec
index 66a30ca..5ea3a30 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -2,8 +2,8 @@
 %bcond_without doc
 
 Name:           ipython
-Version:        6.4.0
-Release:        4%{?dist}
+Version:        7.0.1
+Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
 # See bug #603178 for a quick overview for the choice of licenses
@@ -11,7 +11,11 @@ Summary:        An enhanced interactive Python shell
 # There are some extensions released under GPLv2+
 License:        (BSD and MIT and Python) and GPLv2+
 URL:            http://ipython.org/
-Source0:        https://files.pythonhosted.org/packages/source/i/ipython/ipython-%{version}.tar.gz
+Source0:        %pypi_source
+
+# Build with Sphinx 1.7
+# revert https://github.com/ipython/ipython/commit/ce22f49932fd4f071804e59f3c9d3f7042b917dd
+Patch1:         sphinx-1.7.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
@@ -74,7 +78,7 @@ BuildRequires:  python3-decorator
 BuildRequires:  python3-jedi >= 0.10
 BuildRequires:  python3-pexpect
 BuildRequires:  python3-pickleshare
-BuildRequires:  python3-prompt_toolkit
+BuildRequires:  python3-prompt-toolkit >= 2
 BuildRequires:  python3-simplegeneric
 BuildRequires:  python3-traitlets >= 4.2
 Requires:       python3-backcall
@@ -82,10 +86,10 @@ Requires:       python3-decorator
 Requires:       python3-jedi >= 0.10
 Requires:       python3-pexpect
 Requires:       python3-pickleshare
-Requires:       python3-prompt_toolkit
+Requires:       python3-prompt-toolkit >=2
 Requires:       python3-pygments
 Requires:       python3-setuptools
-Requires:       python3-simplegeneric
+Requires:       python3-simplegeneric > 0.8
 Requires:       python3-traitlets >= 4.2
 
 %description -n python3-ipython
@@ -135,7 +139,7 @@ This package contains the documentation of %{name}.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 # delete bundling libs
 pushd IPython/external
@@ -236,6 +240,9 @@ popd
 
 
 %changelog
+* Wed Oct 03 2018 Miro Hrončok <mhroncok@redhat.com> - 7.0.1-1
+- Update to 7.0.1 (#1610063)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 694d690..4669b9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipython-6.4.0.tar.gz) = 2910acd750a235feb20e8aa215c27fe5ee2867db1fc073acc25e302ace554b764580da8a63fe364e8ce9e5a58d13be5a293f179cf8b820b6c526da0b737b2117
+SHA512 (ipython-7.0.1.tar.gz) = cfd70de38fe787441dc0d65afd5b507dbf124db3c380db23833a7583ca394c02d42b134312a4de9e9763793110330568c1bb1b648c06108ce6dbb07502e12e7f
diff --git a/sphinx-1.7.patch b/sphinx-1.7.patch
new file mode 100644
index 0000000..77df1d7
--- /dev/null
+++ b/sphinx-1.7.patch
@@ -0,0 +1,151 @@
+diff --git a/docs/source/config/extensions/autoreload.rst b/docs/source/config/extensions/autoreload.rst
+index 3b35489..619605e 100644
+--- a/docs/source/config/extensions/autoreload.rst
++++ b/docs/source/config/extensions/autoreload.rst
+@@ -4,6 +4,4 @@
+ autoreload
+ ==========
+ 
+-.. magic:: autoreload
+-
+ .. automodule:: IPython.extensions.autoreload
+diff --git a/docs/source/interactive/autoawait.rst b/docs/source/interactive/autoawait.rst
+index 61611dc..c582590 100644
+--- a/docs/source/interactive/autoawait.rst
++++ b/docs/source/interactive/autoawait.rst
+@@ -230,7 +230,7 @@ Update ipykernel to version 5.0 or greater::
+    # or
+    conda install ipykernel ipython --upgrade
+ 
+-This should automatically enable :magic:`autoawait` integration. Unlike
++This should automatically enable :magic:`%autoawait` integration. Unlike
+ terminal IPython, all code runs on ``asyncio`` eventloop, so creating a loop by
+ hand will not work, including with magics like :magic:`%run` or other
+ frameworks that create the eventloop themselves. In cases like these you can
+diff --git a/docs/source/whatsnew/version7.rst b/docs/source/whatsnew/version7.rst
+index 1a8e1ef..4b44244 100644
+--- a/docs/source/whatsnew/version7.rst
++++ b/docs/source/whatsnew/version7.rst
+@@ -119,10 +119,10 @@ Non-Asynchronous code
+ ~~~~~~~~~~~~~~~~~~~~~
+ 
+ As the internal API of IPython are now asynchronous, IPython need to run under
+-an even loop. In order to allow many workflow, (like using the :magic:`%run`
+-magic, or copy_pasting code that explicitly starts/stop event loop), when
+-top-level code is detected as not being asynchronous, IPython code is advanced
+-via a pseudo-synchronous runner, and will not may not advance pending tasks.
++an even loop. In order to allow many workflow, (like using the ``%run`` magic,
++or copy_pasting code that explicitly starts/stop event loop), when top-level code
++is detected as not being asynchronous, IPython code is advanced via a
++pseudo-synchronous runner, and will not may not advance pending tasks.
+ 
+ Change to Nested Embed
+ ~~~~~~~~~~~~~~~~~~~~~~
+@@ -156,17 +156,11 @@ minrk, njsmith, pganssle, tacaswell, takluyver , vidartf ... And many others.
+ Autoreload Improvement
+ ----------------------
+ 
+-The magic :magic:`%autoreload 2 <autoreload>` now captures new methods added to
+-classes. Earlier, only methods existing as of the initial import were being
+-tracked and updated.  
++The magic ``%autoreload 2`` now captures new methods added to classes. Earlier, only methods existing as of the initial import were being tracked and updated.  
+ 
+-This new feature helps dual environment development - Jupyter+IDE - where the
+-code gradually moves from notebook cells to package files, as it gets
+-structured.
++This new feature helps dual environment development - Jupyter+IDE - where the code gradually moves from notebook cells to package files, as it gets structured.
+ 
+-**Example**: An instance of the class ``MyClass`` will be able to access the
+-method ``cube()`` after it is uncommented and the file ``file1.py`` saved on
+-disk.
++**Example**: An instance of the class `MyClass` will be able to access the method `cube()` after it is uncommented and the file `file1.py` saved on disk.
+ 
+ 
+ ..code::
+@@ -202,14 +196,13 @@ Misc
+ The autoindent feature that was deprecated in 5.x was re-enabled and
+ un-deprecated in :ghpull:`11257`
+ 
+-Make :magic:`%run -n -i ... <run>` work correctly. Earlier, if :magic:`%run` was
+-passed both arguments, ``-n`` would be silently ignored. See :ghpull:`10308`
++Make ``%run -n -i ...`` work correctly. Earlier, if ``%run`` was passed both arguments, ``-n`` would be silently ignored. See :ghpull:`10308`
+ 
+ 
+-The :cellmagic:`%%script`` (as well as :cellmagic:`%%bash``,
+-:cellmagic:`%%ruby``... ) cell magics now raise by default if the return code of
+-the given code is non-zero (thus halting execution of further cells in a
+-notebook). The behavior can be disable by passing the ``--no-raise-error`` flag.
++The ``%%script`` (as well as ``%%bash``, ``ruby``... ) cell magics now raise
++by default if the return code of the given code is non-zero (thus halting
++execution of further cells in a notebook). The behavior can be disable by
++passing the ``--no-raise-error`` flag.
+ 
+ 
+ Deprecations
+diff --git a/docs/sphinxext/github.py b/docs/sphinxext/github.py
+index dcc0250..8f0ffc0 100644
+--- a/docs/sphinxext/github.py
++++ b/docs/sphinxext/github.py
+@@ -19,9 +19,6 @@ Authors
+ 
+ from docutils import nodes, utils
+ from docutils.parsers.rst.roles import set_classes
+-from sphinx.util.logging import getLogger
+-
+-info = getLogger(__name__).info
+ 
+ def make_link_node(rawtext, app, type, slug, options):
+     """Create a link to a github resource.
+@@ -78,7 +75,7 @@ def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+         prb = inliner.problematic(rawtext, rawtext, msg)
+         return [prb], [msg]
+     app = inliner.document.settings.env.app
+-    #info('issue %r' % text)
++    #app.info('issue %r' % text)
+     if 'pull' in name.lower():
+         category = 'pull'
+     elif 'issue' in name.lower():
+@@ -108,7 +105,7 @@ def ghuser_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+     :param content: The directive content for customization.
+     """
+     app = inliner.document.settings.env.app
+-    #info('user link %r' % text)
++    #app.info('user link %r' % text)
+     ref = 'https://www.github.com/' + text
+     node = nodes.reference(rawtext, text, refuri=ref, **options)
+     return [node], []
+@@ -129,7 +126,7 @@ def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
+     :param content: The directive content for customization.
+     """
+     app = inliner.document.settings.env.app
+-    #info('user link %r' % text)
++    #app.info('user link %r' % text)
+     try:
+         base = app.config.github_project_url
+         if not base:
+@@ -149,7 +146,7 @@ def setup(app):
+ 
+     :param app: Sphinx application context.
+     """
+-    info('Initializing GitHub plugin')
++    app.info('Initializing GitHub plugin')
+     app.add_role('ghissue', ghissue_role)
+     app.add_role('ghpull', ghissue_role)
+     app.add_role('ghuser', ghuser_role)
+diff --git a/docs/sphinxext/magics.py b/docs/sphinxext/magics.py
+index d96b41c..913a0c5 100644
+--- a/docs/sphinxext/magics.py
++++ b/docs/sphinxext/magics.py
+@@ -37,10 +37,9 @@ class CellMagicRole(LineMagicRole):
+ 
+ def setup(app):
+     app.add_object_type('magic', 'magic', 'pair: %s; magic command', parse_magic)
+-    app.add_role_to_domain('std', 'magic', LineMagicRole(), override=True)
+-
++    StandardDomain.roles['magic'] = LineMagicRole()
+     app.add_object_type('cellmagic', 'cellmagic', 'pair: %s; cell magic', parse_cell_magic)
+-    app.add_role_to_domain('std', 'cellmagic', CellMagicRole(), override=True)
++    StandardDomain.roles['cellmagic'] = CellMagicRole()
+ 
+     metadata = {'parallel_read_safe': True, 'parallel_write_safe': True}
+     return metadata